Procházet zdrojové kódy

Revert "HUE-1061 [useradmin] Edit group name"

This reverts commit 0efebd4f5d41e451fa04f108ef2c1f183c23ce7f.
Abraham Elmahrek před 12 roky
rodič
revize
fa0fa4b

+ 1 - 1
apps/useradmin/src/useradmin/forms.py

@@ -193,7 +193,7 @@ class GroupEditForm(forms.ModelForm):
     super(GroupEditForm, self).__init__(*args, **kwargs)
 
     if self.instance.id:
-      # self.fields['name'].widget.attrs['readonly'] = True
+      self.fields['name'].widget.attrs['readonly'] = True
       initial_members = User.objects.filter(groups=self.instance).order_by('username')
       initial_perms = HuePermission.objects.filter(grouppermission__group=self.instance).order_by('app','description')
     else:

+ 2 - 9
apps/useradmin/src/useradmin/tests.py

@@ -271,18 +271,11 @@ def test_group_admin():
 
   # Should be one group left, because we created the other group
   response = c.post('/useradmin/groups/delete/testgroup')
-  assert_equal(len(Group.objects.all()), 1)
+  assert_true(len(Group.objects.all()) == 1)
 
   group_count = len(Group.objects.all())
   response = c.post('/useradmin/groups/new', dict(name="with space"))
-  group_count += 1
-  assert_equal(len(Group.objects.all()), group_count)
-
-  # Rename a group
-  response = c.post('/useradmin/groups/edit/with space', dict(name='withspace'))
-  assert_equal(len(Group.objects.all()), group_count)
-  assert_equal(len(Group.objects.filter(name='withspace')), 1)
-  assert_equal(len(Group.objects.filter(name='with space')), 0)
+  assert_equal(len(Group.objects.all()), group_count + 1)
 
 def test_user_admin():
   FUNNY_NAME = '~`!@#$%^&*()_-+={}[]|\;"<>?/,.'