[Update] 修改资产获取select

apps/assets/models/node.py

@@ -19,7 +19,7 @@ class Node(models.Model):
     is_asset = False
 
     def __str__(self):
-        return self.value
+        return self.full_value
 
     @property
     def name(self):
@@ -30,7 +30,7 @@ class Node(models.Model):
         if self == self.__class__.root():
             return self.value
         else:
-            return '{}/{}'.format(self.value, self.parent.full_value)
+            return '{} / {}'.format(self.parent.full_value, self.value)
 
     @property
     def level(self):

apps/assets/templates/assets/_add_assets_to_node_modal.html

-{% extends 'assets/_asset_list_modal.html' %}
-{% load i18n %}
-
-{% block modal_button %}
-    <button class="btn btn-white btn-node-update" type="button" id="btn_move">{% trans "Move to" %}</button>
-    <button class="btn btn-primary btn-node-update" type="button" id="btn_copy">{% trans 'Copy to' %}</button>
-{% endblock %}
\ No newline at end of file

apps/assets/templates/assets/_asset_list_modal.html

@@ -14,6 +14,7 @@
     padding: 10px 10px;
     text-align: center;
 }
+
 #assetTree2.ztree * {
     background-color: #f8fafb;
 }
@@ -97,9 +98,7 @@ function initTree2() {
     $.get("{% url 'api-assets:node-list' %}", function(data, status){
         $.each(data, function (index, value) {
             value["pId"] = value["parent"];
-            {#if (value["key"] === "0") {#}
             value["open"] = true;
-            {# }#}
             value["name"] = value["value"] + ' (' + value['assets_amount'] + ')';
             value['value'] = value['value'];
         });

apps/assets/templates/assets/asset_list.html

@@ -117,25 +117,27 @@
 
 <div id="rMenu">
     <ul class="dropdown-menu">
-        <li id="menu_asset_create" class="btn-create-asset" tabindex="-1"><a>{% trans 'Create asset' %}</a></li>
-        <li id="menu_asset_add" class="btn-add-asset" data-toggle="modal" data-target="#asset_list_modal" tabindex="0"><a>{% trans 'Add asset' %}</a></li>
-        <li id="menu_refresh_hardware_info" class="btn-refresh-hardware" tabindex="-1"><a>{% trans 'Refresh node hardware info' %}</a></li>
-        <li id="menu_test_connective" class="btn-test-connective" tabindex="-1"><a>{% trans 'Test node connective' %}</a></li>
         <li class="divider"></li>
-        <li id="m_create" tabindex="-1" onclick="addTreeNode();"><a>{% trans 'Add node' %}</a></li>
-        <li id="m_del" tabindex="-1" onclick="editTreeNode();"><a>{% trans 'Rename node' %}</a></li>
+        <li id="m_create" tabindex="-1" onclick="addTreeNode();"><a><i class="fa fa-plus-square-o"></i> {% trans 'Add node' %}</a></li>
+        <li id="m_del" tabindex="-1" onclick="editTreeNode();"><a><i class="fa fa-pencil-square-o"></i> {% trans 'Rename node' %}</a></li>
+        <li id="m_del" tabindex="-1" onclick="removeTreeNode();"><a><i class="fa fa-minus-square"></i> {% trans 'Delete node' %}</a></li>
         <li class="divider"></li>
-        <li id="m_del" tabindex="-1" onclick="removeTreeNode();"><a>{% trans 'Delete node' %}</a></li>
+        <li id="menu_asset_add" class="btn-add-asset" data-toggle="modal" data-target="#asset_list_modal" tabindex="0"><a><i class="fa fa-copy"></i> {% trans 'Add assets to node' %}</a></li>
+        <li id="menu_asset_move" class="btn-move-asset" data-toggle="modal" data-target="#asset_list_modal" tabindex="0"><a><i class="fa fa-cut"></i> {% trans 'Move assets to node' %}</a></li>
+        <li class="divider"></li>
+        <li id="menu_refresh_hardware_info" class="btn-refresh-hardware" tabindex="-1"><a><i class="fa fa-refresh"></i> {% trans 'Refresh node hardware info' %}</a></li>
+        <li id="menu_test_connective" class="btn-test-connective" tabindex="-1"><a><i class="fa fa-chain"></i> {% trans 'Test node connective' %}</a></li>
     </ul>
 </div>
 
 {% include 'assets/_asset_import_modal.html' %}
-{% include 'assets/_add_assets_to_node_modal.html' %}
+{% include 'assets/_asset_list_modal.html' %}
 {% endblock %}
 
 {% block custom_foot_js %}
 <script>
 var zTree, rMenu, asset_table, show = 0;
+var update_node_action = "";
 function initTable() {
     var options = {
         ele: $('#asset_list_table'),
@@ -669,7 +671,7 @@ $(document).ready(function(){
     }
     $(".ipt_check_all").prop("checked", false)
 })
-.on('click', '.btn-node-update', function () {
+.on('click', '#btn_asset_modal_confirm', function () {
     var assets_selected = asset_table2.selected;
     var current_node;
     var nodes = zTree.getSelectedNodes();
@@ -687,9 +689,8 @@ $(document).ready(function(){
         asset_table2.ajax.reload()
     };
 
-    var btn_id = $(this).attr('id');
     var url = '';
-    if (btn_id === "btn_move") {
+    if (update_node_action === "move") {
         url = "{% url 'api-assets:node-replace-assets' pk=DEFAULT_PK %}".replace("{{ DEFAULT_PK }}", current_node.id);
     } else {
         url = "{% url 'api-assets:node-add-assets' pk=DEFAULT_PK %}".replace("{{ DEFAULT_PK }}", current_node.id);
@@ -703,6 +704,10 @@ $(document).ready(function(){
     })
 }).on('hidden.bs.modal', '#asset_list_modal', function () {
     window.location.reload();
+}).on('click', '#menu_asset_add', function () {
+    update_node_action = "add"
+}).on('click', '#menu_asset_move', function () {
+    update_node_action = "move"
 })
 </script>
 

apps/assets/templates/assets/domain_create_update.html

@@ -18,14 +18,25 @@
         </div>
     </div>
 </form>
+{% include 'assets/_asset_list_modal.html' %}
 {% endblock %}
 
 {% block custom_foot_js %}
 <script type="text/javascript">
-    $(document).ready(function () {
-        $('.select2').select2({
-            closeOnSelect: false
-        });
+$(document).ready(function () {
+    console.log($.fn.select2.defaults);
+    $('.select2').select2().off("select2:open");
+}).on('click', '.select2-selection__rendered', function (e) {
+    e.preventDefault();
+    $("#asset_list_modal").modal();
+})
+.on('click', '#btn_asset_modal_confirm', function () {
+    var assets = asset_table2.selected;
+    $.each(assets, function (id, data) {
+        $('.select2').val(assets).trigger('change');
     });
+    $("#asset_list_modal").modal('hide');
+
+})
 </script>
 {% endblock %}
\ No newline at end of file

apps/assets/templates/assets/label_create_update.html

@@ -3,6 +3,8 @@
 {% load bootstrap3 %}
 {% load i18n %}
 
+
+
 {% block form %}
 <form id="groupForm" method="post" class="form-horizontal">
     {% csrf_token %}
@@ -18,14 +20,28 @@
         </div>
     </div>
 </form>
+{% include 'assets/_asset_list_modal.html' %}
 {% endblock %}
 
 {% block custom_foot_js %}
 <script type="text/javascript">
-    $(document).ready(function () {
+$(document).ready(function () {
     $('.select2').select2({
         closeOnSelect: false
+    })
+}).on('click', '.select2-selection__rendered', function (e) {
+    e.preventDefault();
+    $("#asset_list_modal").modal();
+})
+.on('click', '#btn_asset_modal_confirm', function () {
+    var assets = asset_table2.selected;
+    $('.select2 option:selected').each(function (i, data) {
+        assets.push($(data).attr('value'))
     });
+    $.each(assets, function (id, data) {
+        $('.select2').val(assets).trigger('change');
     });
+    $("#asset_list_modal").modal('hide');
+})
 </script>
 {% endblock %}
\ No newline at end of file

apps/perms/templates/perms/asset_permission_create_update.html

@@ -76,12 +76,15 @@
             </div>
         </div>
     </div>
+    {% include 'assets/_asset_list_modal.html' %}
 {% endblock %}
 {% block custom_foot_js %}
-    <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
-    <script>
-        $(document).ready(function () {
-            $('.select2').select2();
+<script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
+<script>
+$(document).ready(function () {
+    $('.select2').select2({
+        closeOnSelect: false
+    });
     $('#datepicker').datepicker({
         format: "yyyy-mm-dd",
         todayBtn: "linked",
@@ -90,6 +93,20 @@
         calendarWeeks: true,
         autoclose: true
     });
+    $("#id_assets").parent().find(".select2-selection").on('click', function (e) {
+        e.preventDefault();
+        $("#asset_list_modal").modal();
     })
-    </script>
+})
+.on('click', '#btn_asset_modal_confirm', function () {
+    var assets = asset_table2.selected;
+    $('.select2 option:selected').each(function (i, data) {
+        assets.push($(data).attr('value'))
+    });
+    $.each(assets, function (id, data) {
+        $('.select2').val(assets).trigger('change');
+    });
+    $("#asset_list_modal").modal('hide');
+})
+</script>
 {% endblock %}
\ No newline at end of file

apps/templates/_modal.html

 {% load i18n %}
+<style>
+.modal-body {
+    padding: 0px 20px 0px 20px;
+}
+</style>
 <div aria-hidden="true" role="dialog" id="{% block modal_id %}{% endblock %}" class="modal inmodal">
     <div class="modal-dialog {% block modal_class %}{% endblock %}">
         <div class="modal-content animated fadeIn">

apps/templates/_nav.html

@@ -61,7 +61,7 @@
 </li>
 <li id="audits">
     <a>
-        <i class="fa fa-coffee" style="width: 14px"></i> <span class="nav-label">{% trans 'Audits' %}</span><span class="fa arrow"></span>
+        <i class="fa fa-history" style="width: 14px"></i> <span class="nav-label">{% trans 'Audits' %}</span><span class="fa arrow"></span>
     </a>
     <ul class="nav nav-second-level">
         <li id="ftp-log"><a href="{% url 'audits:ftp-log-list' %}">{% trans 'FTP log' %}</a></li>