dashboard: rename AclUserAddForm

circle/dashboard/forms.py

@@ -1055,9 +1055,12 @@ class UserCreationForm(OrgUserCreationForm):
         return user
         return user
 
 
 
 
-class AclUserAddForm(forms.Form):
+class AclUserOrGroupAddForm(forms.Form):
     name = forms.CharField(widget=autocomplete_light.TextWidget(
     name = forms.CharField(widget=autocomplete_light.TextWidget(
-        'AclUserAutocomplete', attrs={'class': 'form-control'}))
+        'AclUserGroupAutocomplete',
+        autocomplete_js_attributes={'placeholder': _("Name of group or user")},
+        attrs={'class': 'form-control'}))
+
 
 
 
 
 class UserKeyForm(forms.ModelForm):
 class UserKeyForm(forms.ModelForm):

circle/dashboard/views.py

@@ -70,7 +70,7 @@ from .forms import (
     UserCreationForm, GroupProfileUpdateForm, UnsubscribeForm,
     UserCreationForm, GroupProfileUpdateForm, UnsubscribeForm,
     VmSaveForm, UserKeyForm, VmRenewForm, VmStateChangeForm,
     VmSaveForm, UserKeyForm, VmRenewForm, VmStateChangeForm,
     CirclePasswordChangeForm, VmCreateDiskForm, VmDownloadDiskForm,
     CirclePasswordChangeForm, VmCreateDiskForm, VmDownloadDiskForm,
-    TraitsForm, RawDataForm, GroupPermissionForm, AclUserAddForm,
+    TraitsForm, RawDataForm, GroupPermissionForm, AclUserOrGroupAddForm,
     VmResourcesForm, VmAddInterfaceForm, VmListSearchForm,
     VmResourcesForm, VmAddInterfaceForm, VmListSearchForm,
     TemplateListSearchForm, ConnectCommandForm
     TemplateListSearchForm, ConnectCommandForm
 )
 )
@@ -390,7 +390,7 @@ class VmDetailView(CheckedDetailView):
         ).all()
         ).all()
         context['acl'] = AclUpdateView.get_acl_data(
         context['acl'] = AclUpdateView.get_acl_data(
             instance, self.request.user, 'dashboard.views.vm-acl')
             instance, self.request.user, 'dashboard.views.vm-acl')
-        context['aclform'] = AclUserAddForm()
+        context['aclform'] = AclUserOrGroupAddForm()
         context['os_type_icon'] = instance.os_type.replace("unknown",
         context['os_type_icon'] = instance.os_type.replace("unknown",
                                                            "question")
                                                            "question")
         # ipv6 infos
         # ipv6 infos
@@ -1282,7 +1282,7 @@ class GroupDetailView(CheckedDetailView):
         context['acl'] = AclUpdateView.get_acl_data(
         context['acl'] = AclUpdateView.get_acl_data(
             self.object.profile, self.request.user,
             self.object.profile, self.request.user,
             'dashboard.views.group-acl')
             'dashboard.views.group-acl')
-        context['aclform'] = AclUserAddForm()
+        context['aclform'] = AclUserOrGroupAddForm()
         context['group_profile_form'] = GroupProfileUpdate.get_form_object(
         context['group_profile_form'] = GroupProfileUpdate.get_form_object(
             self.request, self.object.profile)
             self.request, self.object.profile)
 
 
@@ -1717,7 +1717,7 @@ class TemplateDetail(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
             obj, self.request.user, 'dashboard.views.template-acl')
             obj, self.request.user, 'dashboard.views.template-acl')
         context['disks'] = obj.disks.all()
         context['disks'] = obj.disks.all()
         context['is_owner'] = obj.has_level(self.request.user, 'owner')
         context['is_owner'] = obj.has_level(self.request.user, 'owner')
-        context['aclform'] = AclUserAddForm()
+        context['aclform'] = AclUserOrGroupAddForm()
         return context
         return context
 
 
     def get_success_url(self):
     def get_success_url(self):

circle/network/views.py

@@ -42,7 +42,7 @@ from operator import itemgetter
 from itertools import chain
 from itertools import chain
 import json
 import json
 from dashboard.views import AclUpdateView
 from dashboard.views import AclUpdateView
-from dashboard.forms import AclUserAddForm
+from dashboard.forms import AclUserOrGroupAddForm
 
 
 
 
 class SuccessMessageMixin(FormMixin):
 class SuccessMessageMixin(FormMixin):
@@ -654,7 +654,7 @@ class VlanDetail(LoginRequiredMixin, SuperuserRequiredMixin,
         context['vlan_vid'] = self.kwargs.get('vid')
         context['vlan_vid'] = self.kwargs.get('vid')
         context['acl'] = AclUpdateView.get_acl_data(
         context['acl'] = AclUpdateView.get_acl_data(
             self.object, self.request.user, 'network.vlan-acl')
             self.object, self.request.user, 'network.vlan-acl')
-        context['aclform'] = AclUserAddForm()
+        context['aclform'] = AclUserOrGroupAddForm()
         return context
         return context
 
 
     success_url = reverse_lazy('network.vlan_list')
     success_url = reverse_lazy('network.vlan_list')