Merge pull request #1910 from jumpserver/dev_cloud_manager

[Feature] 添加xpack-云管中心模块

apps/assets/models/node.py

@@ -31,6 +31,8 @@ class Node(OrgModelMixin):
         return self.full_value
 
     def __eq__(self, other):
+        if not other:
+            return False
         return self.key == other.key
 
     def __gt__(self, other):

apps/static/js/jumpserver.js

@@ -145,7 +145,14 @@ function activeNav() {
     var resource = url_array[2];
     if (app === ''){
         $('#index').addClass('active');
-    } else {
+    }
+    else if (app === 'xpack') {
+        var item = url_array[3];
+        $("#" + app).addClass('active');
+        $('#' + app + ' #' + resource).addClass('active');
+        $('#' + app + ' #' + resource + ' #' + item + ' a').css('color', '#ffffff');
+    }
+    else {
         $("#" + app).addClass('active');
         $('#' + app + ' #' + resource).addClass('active');
     }

apps/templates/_nav.html

@@ -95,7 +95,17 @@
     </a>
     <ul class="nav nav-second-level">
         {% for plugin in XPACK_PLUGINS %}
-        <li id="{{ plugin.name }}"><a href="{{ plugin.endpoint }}">{% trans plugin.verbose_name %}</a></li>
+            {% ifequal plugin.name 'cloud'%}
+                <li id="{{ plugin.name }}">
+                    <a href="#"><span class="nav-label">{% trans plugin.verbose_name %}</span><span class="fa arrow"></span></a>
+                    <ul class="nav nav-third-level">
+                        <li id="account"><a href="{% url 'xpack:cloud:account-list' %}">{% trans 'Account list' %}</a></li>
+                        <li id="sync-task"><a href="{% url 'xpack:cloud:sync-task-list' %}">{% trans 'Task list' %}</a></li>
+                    </ul>
+                </li>
+            {% else %}
+                <li id="{{ plugin.name }}"><a href="{{ plugin.endpoint }}">{% trans plugin.verbose_name %}</a></li>
+            {% endifequal %}
         {% endfor %}
     </ul>
 </li>