From 722863428de1adec2ef2f5e568b2573ed3e6e987 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 12 Dec 2017 14:28:12 +0800
Subject: [PATCH] =?UTF-8?q?[Feature]=20=E6=B7=BB=E5=8A=A0context=5Fprocess?=
 =?UTF-8?q?or?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/asset_list.html | 30 +++++---------------
 apps/assets/urls/views_urls.py               |  2 +-
 apps/assets/views/asset.py                   |  1 +
 apps/jumpserver/context_processor.py         | 15 ++++++++++
 apps/jumpserver/settings.py                  |  1 +
 apps/ops/urls/api_urls.py                    |  2 ++
 apps/ops/urls/view_urls.py                   |  2 ++
 apps/static/js/jumpserver.js                 |  2 +-
 apps/users/views/login.py                    |  5 ++--
 9 files changed, 33 insertions(+), 27 deletions(-)
 create mode 100644 apps/jumpserver/context_processor.py

diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index f7709bdfa..f1c8d2061 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -63,23 +63,6 @@
 {% block custom_foot_js %}
 <script src="{% static 'js/jquery.form.min.js' %}"></script>
 <script type="text/javascript">
-window.onload = function (){
-        var tag_on = document.getElementsByName("tag_on");
-        var oDiv = document.getElementById("ydxbd");
-        if(tag_on.length > 0){
-            oDiv.style.display = "block";
-        }
-    };
-
-function tagShow() {
-    var oDiv = document.getElementById("ydxbd");
-    if (oDiv.style.display == 'none'){
-        oDiv.style.display = "block";
-    }else{
-        oDiv.style.display = "none";
-    }
-}  //onload;
-
 
 
 $(document).ready(function(){
@@ -87,8 +70,10 @@ $(document).ready(function(){
         ele: $('#asset_list_table'),
         columnDefs: [
             {targets: 1, createdCell: function (td, cellData, rowData) {
-                var detail_btn = '<a href="{% url "assets:asset-detail" pk=99991937 %}">' + cellData + '</a>';
-                $(td).html(detail_btn.replace('99991937', rowData.id));
+                {% url 'assets:asset-detail' pk=DEFAULT_PK as the_url  %}
+                console.log('{{ the_url }}');
+                var detail_btn = '<a href="{{ the_url }}">' + cellData + '</a>';
+                $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
             }},
             {targets: 7, createdCell: function (td, cellData) {
                 if (!cellData) {
@@ -107,8 +92,8 @@ $(document).ready(function(){
                 }
             }},
             {targets: 9, createdCell: function (td, cellData, rowData) {
-                var update_btn = '<a href="{% url "assets:asset-update" pk=99991937 %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace('99991937', cellData);
-                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_asset_delete" data-uid="99991937">{% trans "Delete" %}</a>'.replace('99991937', cellData);
+                var update_btn = '<a href="{% url "assets:asset-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace("{{ DEFAULT_PK }}", cellData);
+                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_asset_delete" data-uid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('99991937', cellData);
                 $(td).html(update_btn + del_btn)
             }}
         ],
@@ -166,8 +151,7 @@ $(document).ready(function(){
     var $data_table = $("#asset_list_table").DataTable();
     var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
     var uid = $this.data('uid');
-    var the_url = '{% url "api-assets:asset-detail" pk=99991937 %}'.replace('99991937', uid);
-    console.log(the_url);
+    var the_url = '{% url "api-assets:asset-detail" pk=99991937 %}'.replace("{{ DEFAULT_PK }}", uid);
     objectDelete($this, name, the_url);
     setTimeout( function () {
         $data_table.ajax.reload();
diff --git a/apps/assets/urls/views_urls.py b/apps/assets/urls/views_urls.py
index b83a00120..ab9a0b86c 100644
--- a/apps/assets/urls/views_urls.py
+++ b/apps/assets/urls/views_urls.py
@@ -11,7 +11,7 @@ urlpatterns = [
     url(r'^asset/create/$', views.AssetCreateView.as_view(), name='asset-create'),
     url(r'^asset/export/$', views.AssetExportView.as_view(), name='asset-export'),
     url(r'^asset/import/$', views.BulkImportAssetView.as_view(), name='asset-import'),
-    url(r'^asset/(?P<pk>[0-9a-zA-Z\-]+)/$', views.AssetDetailView.as_view(), name='asset-detail'),
+    url(r'^asset/(?P<pk>[0-9a-zA-Z\-]{36})/$', views.AssetDetailView.as_view(), name='asset-detail'),
     url(r'^asset/(?P<pk>[0-9a-zA-Z\-]+)/update/$', views.AssetUpdateView.as_view(), name='asset-update'),
     url(r'^asset/(?P<pk>[0-9a-zA-Z\-]+)/delete/$', views.AssetDeleteView.as_view(), name='asset-delete'),
     url(r'^asset-modal$', views.AssetModalListView.as_view(), name='asset-modal-list'),
diff --git a/apps/assets/views/asset.py b/apps/assets/views/asset.py
index a774c127a..71f0d500f 100644
--- a/apps/assets/views/asset.py
+++ b/apps/assets/views/asset.py
@@ -62,6 +62,7 @@ class UserAssetListView(LoginRequiredMixin, TemplateView):
             'app': 'Assets',
             'action': 'Asset list',
             'system_users': SystemUser.objects.all(),
+            'default_pk': '00000000-0000-0000-0000-000000000000',
         }
         kwargs.update(context)
         return super(UserAssetListView, self).get_context_data(**kwargs)
diff --git a/apps/jumpserver/context_processor.py b/apps/jumpserver/context_processor.py
new file mode 100644
index 000000000..c7a5c34d4
--- /dev/null
+++ b/apps/jumpserver/context_processor.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+#
+
+
+def jumpserver_processor(request):
+    context = {}
+
+    # Setting default pk
+    context.update(
+        {'DEFAULT_PK': '00000000-0000-0000-0000-000000000000'}
+    )
+    return context
+
+
+
diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py
index d464adc92..0352cfb85 100644
--- a/apps/jumpserver/settings.py
+++ b/apps/jumpserver/settings.py
@@ -97,6 +97,7 @@ TEMPLATES = [
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
+                'jumpserver.context_processor.jumpserver_processor',
                 'django.template.context_processors.i18n',
                 'django.template.context_processors.debug',
                 'django.template.context_processors.request',
diff --git a/apps/ops/urls/api_urls.py b/apps/ops/urls/api_urls.py
index af16c3de1..545487f00 100644
--- a/apps/ops/urls/api_urls.py
+++ b/apps/ops/urls/api_urls.py
@@ -5,6 +5,8 @@ from rest_framework.routers import DefaultRouter
 from .. import api
 
 
+app_name = "ops"
+
 router = DefaultRouter()
 router.register(r'v1/tasks', api.TaskViewSet, 'task')
 router.register(r'v1/adhoc', api.AdHocViewSet, 'adhoc')
diff --git a/apps/ops/urls/view_urls.py b/apps/ops/urls/view_urls.py
index e24f4031d..5239665bf 100644
--- a/apps/ops/urls/view_urls.py
+++ b/apps/ops/urls/view_urls.py
@@ -7,6 +7,8 @@ from .. import views
 
 __all__ = ["urlpatterns"]
 
+app_name = "ops"
+
 urlpatterns = [
     # TResource Task url
     url(r'^task/$', views.TaskListView.as_view(), name='task-list'),
diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js
index e8840e9a1..fcbbff4bd 100644
--- a/apps/static/js/jumpserver.js
+++ b/apps/static/js/jumpserver.js
@@ -332,4 +332,4 @@ String.prototype.format = function(args) {
         }
     }
     return result;
-}
+};
diff --git a/apps/users/views/login.py b/apps/users/views/login.py
index ee391de58..860719884 100644
--- a/apps/users/views/login.py
+++ b/apps/users/views/login.py
@@ -17,7 +17,7 @@ from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.debug import sensitive_post_parameters
 from django.views.generic.base import TemplateView
 from django.views.generic.edit import FormView
-from formtools.wizard.views import SessionWizardView
+# from formtools.wizard.views import SessionWizardView
 from django.conf import settings
 from django.utils import timezone
 
@@ -157,7 +157,8 @@ class UserResetPasswordView(TemplateView):
         return HttpResponseRedirect(reverse('users:reset-password-success'))
 
 
-class UserFirstLoginView(LoginRequiredMixin, SessionWizardView):
+class UserFirstLoginView(LoginRequiredMixin, ListView):
+#    class UserFirstLoginView(LoginRequiredMixin, SessionWizardView):
     template_name = 'users/first_login.html'
     form_list = [forms.UserProfileForm, forms.UserPublicKeyForm]
     file_storage = default_storage