merged

apps/assets/api.py

@@ -39,6 +39,12 @@ class AssetGroupViewSet(viewsets.ModelViewSet):
     serializer_class = serializers.AssetGroupSerializer
 
 
+class AssetUpdateGroupApi(generics.RetrieveUpdateAPIView):
+    queryset = Asset.objects.all()
+    serializer_class = serializers.AssetUpdateGroupSerializer
+    permission_classes = (IsSuperUser,)
+
+
 class IDCViewSet(viewsets.ModelViewSet):
     """API endpoint that allows IDC to be viewed or edited."""
     queryset = IDC.objects.all()
@@ -58,6 +64,12 @@ class SystemUserViewSet(viewsets.ModelViewSet):
     permission_classes = (IsSuperUser,)
 
 
+class SystemUserUpdateApi(generics.RetrieveUpdateAPIView):
+    queryset = Asset.objects.all()
+    serializer_class = serializers.AssetUpdateSystemUserSerializer
+    permission_classes = (IsSuperUser,)
+
+
 # class IDCAssetsApi(generics.ListAPIView):
 #     model = IDC
 #     serializer_class = serializers.AssetSerializer

apps/assets/serializers.py

@@ -17,6 +17,19 @@ class AssetGroupSerializer(serializers.ModelSerializer):
     def get_assets_amount(obj):
         return obj.assets.count()
 
+class AssetUpdateGroupSerializer(serializers.ModelSerializer):
+    groups = serializers.PrimaryKeyRelatedField(many=True, queryset=AssetGroup.objects.all())
+
+    class Meta:
+        model = Asset
+        fields = ['id', 'groups']
+
+class AssetUpdateSystemUserSerializer(serializers.ModelSerializer):
+    system_users = serializers.PrimaryKeyRelatedField(many=True, queryset=SystemUser.objects.all())
+
+    class Meta:
+        model = Asset
+        fields = ['id', 'system_users']
 
 class AdminUserSerializer(serializers.ModelSerializer):
     class Meta:

apps/assets/templates/assets/asset_detail.html

@@ -96,7 +96,7 @@
                                         </tr>
                                         <tr>
                                             <td>{% trans 'Asset status' %}:</td>
-                                            <td><b>{{ asset.get_status_display() }}</b></td>
+                                            <td><b>{{ asset.status }}</b></td>
                                         </tr>
                                         <tr>
                                             <td>{% trans 'Is active' %}:</td>
@@ -205,9 +205,9 @@
                                         <form>
                                             <tr>
                                                 <td colspan="2" class="no-borders">
-                                                    <select data-placeholder="{% trans 'Join asset groups' %}" class="select2" style="width: 100%" multiple="" tabindex="4">
+                                                    <select data-placeholder="{% trans 'Join asset groups' %}" id="groups_selected" class="select2" style="width: 100%" multiple="" tabindex="4">
                                                         {% for asset_group in asset_groups_remain %}
-                                                        <option value="{{ asset_group.id }}" >{{ asset_group.name }}</option>
+                                                        <option value="{{ asset_group.id }}" id="opt_{{ asset_group.id }}" >{{ asset_group.name }}</option>
                                                         {% endfor %}
                                                     </select>
                                                 </td>
@@ -221,9 +221,9 @@
 
                                         {% for asset_group in asset_groups %}
                                         <tr>
-                                          <td ><b data-gid={{ asset_group.id }}>{{ asset_group.name }}</b></td>
+                                          <td ><b class="bdg_group" data-gid={{ asset_group.id }}>{{ asset_group.name }}</b></td>
                                           <td>
-                                              <button class="btn btn-danger pull-right btn-xs " type="button"><i class="fa fa-minus"></i></button>
+                                              <button class="btn btn-danger pull-right btn-xs btn_leave_group" type="button"><i class="fa fa-minus"></i></button>
                                           </td>
                                         </tr>
                                         {% endfor %}
@@ -243,22 +243,22 @@
                                                 <td colspan="2">
                                                     <select data-placeholder="{% trans 'Select system user' %}" class="select2" style="width: 100%" multiple="" tabindex="4">
                                                         {% for system_user in system_users_remain %}
-                                                            <option value="{{ system_user.id }}">{{ system_user.name }}</option>
+                                                            <option value="{{ system_user.id }}" id="opt_{{ system_user.id }}">{{ system_user.name }}</option>
                                                         {% endfor %}
                                                     </select>
                                                 </td>
                                             </tr>
                                             <tr class="no-borders-tr">
                                                 <td colspan="2">
-                                                    <button type="button" class="btn btn-warning btn-sm">{% trans 'Associate' %}</button>
+                                                    <button type="button" class="btn btn-warning btn-sm btn-system-user">{% trans 'Associate' %}</button>
                                                 </td>
                                             </tr>
                                         </form>
                                         {% for system_user in system_users %}
                                         <tr>
-                                            <td ><b>{{ system_user.name }}</b></td>
+                                            <td ><b class="bdg_group" data-sid={{ system_user.id }}>{{ system_user.name }}</b></td>
                                             <td>
-                                                <button class="btn btn-danger btn-xs" type="button" style="float: right;"><i class="fa fa-minus"></i></button>
+                                                <button class="btn btn-danger btn-xs pull-right btn_leave_system" type="button" style="float: right;"><i class="fa fa-minus"></i></button>
                                             </td>
                                         </tr>
                                         {% endfor %}
@@ -275,8 +275,154 @@
 {% endblock %}
 {% block custom_foot_js %}
 <script>
+jumpserver.groups_selected = {};
+function updateAssetGroups(groups) {
+    var the_url = "{% url 'api-assets:asset-update-group' pk=asset.id %}";
+    var body = {
+        groups: Object.assign([], groups)
+    };
+    var success = function(data) {
+        // remove all the selected groups from select > option and rendered ul element;
+        $('.select2-selection__rendered').empty();
+        $('#groups_selected').val('');
+        $.map(jumpserver.groups_selected, function(group_name, index) {
+            $('#opt_' + index).remove();
+            // change tr html of user groups.
+            $('.group_edit tbody').append(
+                '<tr>' +
+                '<td><b class="bdg_group" data-gid="' + index + '">' + group_name + '</b></td>' +
+                '<td><button class="btn btn-danger btn-xs pull-right btn_leave_group" type="button"><i class="fa fa-minus"></i></button></td>' +
+                '</tr>'
+            )
+        });
+        // clear jumpserver.groups_selected
+        jumpserver.groups_selected = {};
+    };
+    APIUpdateAttr({
+        url: the_url,
+        body: JSON.stringify(body),
+        success: success
+    });
+}
+
+function updateAssetSystem(system_users) {
+    var the_url = "{% url 'api-assets:asset-update-systemusers' pk=asset.id %}";
+    var body = {
+        system_users: Object.assign([], system_users)
+    };
+    var success = function(data) {
+        $('.select2-selection__rendered').empty();
+        $('#groups_selected').val('');
+        $.map(jumpserver.groups_selected, function(name, index) {
+            $('#opt_' + index).remove();
+
+            $('.group_edit tbody').append(
+                '<tr>' +
+                '<td><b class="bdg_group" data-sid="' + index + '">' + name + '</b></td>' +
+                '<td><button class="btn btn-danger btn-xs pull-right btn_leave_system" type="button"><i class="fa fa-minus"></i></button></td>' +
+                '</tr>'
+            )
+        });
+        // clear jumpserver.groups_selected
+        jumpserver.groups_selected = {};
+    };
+    APIUpdateAttr({
+        url: the_url,
+        body: JSON.stringify(body),
+        success: success
+    });
+}
+
+
 $(document).ready(function () {
-    $('.select2').select2();
+    $('.select2').select2()
+    .on('select2:select', function(evt) {
+            var data = evt.params.data;
+            jumpserver.groups_selected[data.id] = data.text;
+        }).on('select2:unselect', function(evt) {
+            var data = evt.params.data;
+            delete jumpserver.groups_selected[data.id]
+        })
 })
+	.on('click', '#is_active', function () {
+	var the_url = '{% url "api-assets:asset-detail" pk=asset.id %}';
+	var checked = $(this).prop('checked');
+    var body = {
+        'is_active': checked
+    };
+    var success = '{% trans "Update Successfully!" %}';
+    var status = $(".ibox-content > table > tbody > tr:nth-child(13) > td:last >b").text();
+    APIUpdateAttr({
+        url: the_url,
+        body: JSON.stringify(body),
+        success_message: success
+    });
+    if (status == "False") {
+    	$(".ibox-content > table > tbody > tr:nth-child(13) > td:last >b").html('True');
+    }else{
+    	$(".ibox-content > table > tbody > tr:nth-child(13) > td:last >b").html('False');
+    }
+})
+	.on('click', '#btn_add_user_group', function () {
+		if (Object.keys(jumpserver.groups_selected).length === 0) {
+            return false;
+        }
+	    var groups = $('.bdg_group').map(function() {
+	        return $(this).data('gid');
+	    }).get();
+	    $.map(jumpserver.groups_selected, function(value, index) {
+	        groups.push(parseInt(index));
+	        $('#opt_' + index).remove();
+	    });
+	    updateAssetGroups(groups)
+})
+    .on('click', '.btn_leave_group', function() {
+    var $this = $(this);
+    var $tr = $this.closest('tr');
+    var $badge = $tr.find('.bdg_group');
+    var gid = $badge.data('gid');
+    var group_name = $badge.html() || $badge.text();
+    $('#groups_selected').append(
+        '<option value="' + gid + '" id="opt_' + gid + '">' + group_name + '</option>'
+    );
+    $tr.remove();
+    var groups = $('.bdg_group').map(function () {
+        return $(this).data('gid');
+    }).get();
+    updateAssetGroups(groups)
+})
+    .on('click', '.btn-system-user', function () {
+    	if (Object.keys(jumpserver.groups_selected).length === 0) {
+            return false;
+        }
+	    var system_users = $('.bdg_group').map(function() {
+	        return $(this).data('sid');
+	    }).get();
+	    $.map(jumpserver.groups_selected, function(value, index) {
+	        system_users.push(parseInt(index));
+	        $('#opt_' + index).remove();
+	    });
+	    updateAssetSystem(system_users)
+
+})
+	.on('click', '.btn_leave_system', function () {
+		var $this = $(this);
+	    var $tr = $this.closest('tr');
+	    var $badge = $tr.find('.bdg_group');
+	    var sid = $badge.data('sid');
+	    var name = $badge.html() || $badge.text();
+	    $('#groups_selected').append(
+	        '<option value="' + sid + '" id="opt_' + sid + '">' + name + '</option>'
+	    );
+	    $tr.remove();
+	    var system_users = $('.bdg_group').map(function () {
+	        return $(this).data('sid');
+	    }).get();
+	    console.log(system_users);
+	    updateAssetSystem(system_users)
+
+})
+
+
 </script>
 {% endblock %}

apps/assets/templates/assets/asset_group_list.html

@@ -6,7 +6,7 @@
 <div class="uc pull-left m-l-5 m-r-5">
     <a href="{% url "assets:asset-group-create" %}" class="btn btn-sm btn-primary"> {% trans "Create asset group" %} </a>
 </div>
-<table class="table table-striped table-bordered table-hover " id="admin_user_list_table" >
+<table class="table table-striped table-bordered table-hover " id="asset_groups_list_table" >
     <thead>
     <tr>
         <th class="text-center">
@@ -27,7 +27,7 @@
 <script>
 $(document).ready(function(){
     var options = {
-        ele: $('#admin_user_list_table'),
+        ele: $('#asset_groups_list_table'),
         columnDefs: [
             {targets: 1, createdCell: function (td, cellData, rowData) {
                 var detail_btn = '<a href="{% url "assets:asset-group-detail" pk=99991937 %}">' + cellData + '</a>';
@@ -46,7 +46,14 @@ $(document).ready(function(){
         columns: [{data: "id"}, {data: "name" }, {data: "assets_amount" }, {data: "comment" }, {data: "id"}]
     };
     jumpserver.initDataTable(options);
-});
+})
+	.on('click', '.btn_asset_group_delete', function () {
+		var $this = $(this);
+		var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
+		var uid = $this.data('uid');
+		var the_url = '{% url "api-assets:asset-group-detail" pk=99991937 %}'.replace('99991937', uid);
+		objectDelete($this, name, the_url);
+	});
 </script>
 {% endblock %}
 

apps/assets/templates/assets/asset_list.html

@@ -127,8 +127,9 @@
                 }},
                 {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_user_delete" data-uid="99991937">{% trans "Delete" %}</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);
                     $(td).html(update_btn + del_btn)
+
                  }}
             ],
             ajax_url: '{% url "api-assets:asset-list" %}',
@@ -179,6 +180,14 @@
             $form.ajaxSubmit({success: success});
         })
 
+    })
+	    .on('click', '.btn_asset_delete', function () {
+	        var $this = $(this);
+		    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);
+
+		    objectDelete($this, name, the_url);
     });
 </script>
 {% endblock %}

apps/assets/urls/api_urls.py

@@ -17,6 +17,10 @@ urlpatterns = [
     url(r'^v1/assets_bulk$', api.AssetListUpdateApi.as_view(), name='asset-bulk-update'),
     # url(r'^v1/idc/(?P<pk>[0-9]+)/assets/$', api.IDCAssetsApi.as_view(), name='api-idc-assets'),
     url(r'^v1/system-user/auth', api.SystemUserAuthApi.as_view(), name='system-user-auth'),
+    url(r'^v1/assets/(?P<pk>\d+)/groups$',
+        api.AssetUpdateGroupApi.as_view(), name='asset-update-group'),
+    url(r'^v1/assets/(?P<pk>\d+)/system-users$',
+        api.SystemUserUpdateApi.as_view(), name='asset-update-systemusers'),
 ]
 
 urlpatterns += router.urls

apps/users/templates/users/user_detail.html

@@ -255,16 +255,19 @@ function updateUserGroups(groups) {
         success: success
     });
 }
+
 $(document).ready(function() {
     $('.select2').select2()
         .on('select2:select', function(evt) {
             var data = evt.params.data;
             jumpserver.groups_selected[data.id] = data.text;
-        }).on('select2:unselect', function(evt) {
+        })
+        .on('select2:unselect', function(evt) {
             var data = evt.params.data;
             delete jumpserver.groups_selected[data.id]
         })
-}).on('click', '#is_active', function() {
+})
+    .on('click', '#is_active', function() {
     var the_url = "{% url 'api-users:user-detail' pk=user.id %}";
     var checked = $(this).prop('checked');
     var body = {
@@ -276,19 +279,21 @@ $(document).ready(function() {
         body: JSON.stringify(body),
         success_message: success
     });
-}).on('click', '#enable_otp', function() {
-    var the_url = "{% url 'api-users:user-detail' pk=user.id %}";
-    var checked = $(this).prop('checked');
-    var body = {
-        'enable_otp': checked
-    };
-    var success = '{% trans "Update Successfully!" %}';
-    APIUpdateAttr({
-        url: the_url,
-        body: JSON.stringify(body),
-        success_message: success
-    });
-}).on('click', '#btn_join_group', function() {
+})
+    .on('click', '#enable_otp', function() {
+        var the_url = "{% url 'api-users:user-detail' pk=user.id %}";
+        var checked = $(this).prop('checked');
+        var body = {
+            'enable_otp': checked
+        };
+        var success = '{% trans "Update Successfully!" %}';
+        APIUpdateAttr({
+            url: the_url,
+            body: JSON.stringify(body),
+            success_message: success
+        });
+})
+    .on('click', '#btn_join_group', function() {
     if (Object.keys(jumpserver.groups_selected).length === 0) {
         return false;
     }

apps/users/templates/users/user_list.html

@@ -132,7 +132,8 @@ $(document).ready(function(){
         $form.ajaxSubmit({success: success});
     })
 
-}).on('click', '#btn_bulk_update', function(){
+})
+	.on('click', '#btn_bulk_update', function(){
     var action = $('#slct_bulk_update').val();
     var $data_table = $('#user_list_table').DataTable();
     var id_list = [];
@@ -204,13 +205,15 @@ $(document).ready(function(){
         default:
             break;
     }
-}).on('click', '.btn_user_delete', function(){
+})
+	.on('click', '.btn_user_delete', function(){
     var $this = $(this);
     var name = $this.data('name');
     var uid = $this.data('uid');
     var the_url = '{% url "api-users:user-detail" pk=99991937 %}'.replace('99991937', uid);
     objectDelete($this, name, the_url);
-}).on('click', '#btn_user_bulk_update', function(){
+})
+	.on('click', '#btn_user_bulk_update', function(){
     var json_data = $('#fm_user_bulk_update').serializeObject();
     var body = {};
     body.enable_otp = (json_data.enable_otp === 'on')? true: false;

deb_requirements.txt

@@ -0,0 +1 @@
+ibtiff4-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk

rpm_requirements.txt

@@ -0,0 +1 @@
+libtiff-devel libjpeg-devel libzip-devel freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel