Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev

jumpserver/views.py

@@ -79,18 +79,19 @@ def index_cu(request):
     # user = get_object(User, id=user_id)
     login_types = {'L': 'LDAP', 'M': 'MAP'}
     username = request.user.username
-    posts = Asset.object.all()
-    host_count = len(posts)
-
-    new_posts = []
-    post_five = []
-    for post in posts:
-        if len(post_five) < 5:
-            post_five.append(post)
-        else:
-            new_posts.append(post_five)
-            post_five = []
-    new_posts.append(post_five)
+    # TODO: need fix,liuzheng need Asset help
+    # posts = Asset.object.all()
+    # host_count = len(posts)
+    #
+    # new_posts = []
+    # post_five = []
+    # for post in posts:
+    #     if len(post_five) < 5:
+    #         post_five.append(post)
+    #     else:
+    #         new_posts.append(post_five)
+    #         post_five = []
+    # new_posts.append(post_five)
     return render_to_response('index_cu.html', locals(), context_instance=RequestContext(request))
 
 

juser/views.py

@@ -96,36 +96,37 @@ def group_edit(request):
 
     if request.method == 'GET':
         group_id = request.GET.get('id', '')
-        user_group = get_object(UserGroup, id=group_id)
-        if user_group:
-            users_all = User.objects.all()
-            users_selected = user_group.user_set.all()
-            users_remain = [user for user in users_all if user not in users_selected]
+        # user_group = get_object(UserGroup, id=group_id)
+        user_group = UserGroup.objects.get(id=group_id)
+        users_selected = User.objects.filter(group=user_group)
+        users_remain = User.objects.filter(~Q(group=user_group))
+        users_all = User.objects.all()
 
-    else:
+    elif request.method == 'POST':
         group_id = request.POST.get('group_id', '')
         group_name = request.POST.get('group_name', '')
         comment = request.POST.get('comment', '')
         users_selected = request.POST.getlist('users_selected')
 
-        users = []
         try:
             if '' in [group_id, group_name]:
                 raise ServerError('组名不能为空')
 
-            user_group = get_object(UserGroup, id=group_id)
-            other_group = get_object(UserGroup, name=group_name)
-
-            if other_group and other_group.id != int(group_id):
+            if len(UserGroup.objects.filter(name=group_name)) > 1:
                 raise ServerError(u'%s 用户组已存在' % group_name)
+            # add user group
+            for user in User.objects.filter(id__in=users_selected):
+                user.group.add(UserGroup.objects.get(id=group_id))
+            # delete user group
+            user_group = UserGroup.objects.get(id=group_id)
+            for user in [user for user in User.objects.filter(group=user_group) if user not in User.objects.filter(id__in=users_selected)]:
+                user_group_all = user.group.all()
+                user.group.clear()
+                for g in user_group_all:
+                    if g == user_group:
+                        continue
+                    user.group.add(g)
 
-            for user_id in users_selected:
-                users.extend(User.objects.filter(id=user_id))
-
-            if user_group:
-                user_group.update(name=group_name, comment=comment)
-                user_group.user_set.clear()
-                user_group.user_set = users
 
         except ServerError, e:
             error = e
@@ -133,8 +134,8 @@ def group_edit(request):
             return HttpResponseRedirect('/juser/group_list/')
         else:
             users_all = User.objects.all()
-            users_selected = user_group.user_set.all()
-            users_remain = [user for user in users_all if user not in users_selected]
+            users_selected = User.objects.filter(group=user_group)
+            users_remain = User.objects.filter(~Q(group=user_group))
 
     return my_render('juser/group_edit.html', locals(), request)
 

templates/jperm/perm_rule_add.html

@@ -118,6 +118,37 @@
 {% endblock %}
 {% block self_footer_js %}
 <script>
+
+$('#ruleForm').submit(function() {
+    var result = {}
+    var data = $(this).serializeArray();
+    $.each(data, function(i, field){
+        result[field.name] = field.value;
+    });
+    if (result['user'] || result['usergroup'] || result['asset'] || result['assetgroup'] || result['rulename'] || result['role']) {
+        if (result['rulename'] === '') {
+            alert("请添加授权名称")
+            return false
+        }
+        if (! result['user'] && ! result['usergroup']) {
+            alert("用户和用户组必选１个")
+            return false
+        }
+        if (! result['asset'] && ! result['assetgroup']) {
+            alert("资产和资产组必选１个")
+            return false
+        }
+        if (! result['role']) {
+            alert("请填写角色")
+            return false
+        }
+        return true
+    } else {
+        alert("请填必选项")
+        return false;
+    }
+});
+
 $(document).ready(function(){
     $("input.role").click(function(){
         if($("input.role[value=GA]").is( ":checked" )){

templates/juser/group_list.html

@@ -93,6 +93,7 @@ type="checkbox"  name="selected" value="{{ group.id }}">
     $(document).ready(function(){
         $('.del').click(function(){
             var row = $(this).closest('tr');
+            if (confirm("确定删除")) {
             $.get(
                     $(this).attr('value'),
                     {},
@@ -101,7 +102,7 @@ type="checkbox"  name="selected" value="{{ group.id }}">
                         alert(data);
                     }
 
-            )
+            )}
         });
 
         $('#del_btn').click(function(){

templates/juser/user_edit.html

@@ -42,7 +42,7 @@
                                 <div class="col-sm-8">
                                     <input id="password" name="password" placeholder="Password" type="password" class="form-control">
                                     <span class="help-block m-b-none">
-                                        登陆web的密码
+                                        登陆web的密码（如不修改请留空）
                                     </span>
                                 </div>
                             </div>