network: add default owners for network forms

Also remove copypasted SuccessMessageMixin

circle/network/views.py

@@ -34,6 +34,7 @@ from .forms import (HostForm, VlanForm, DomainForm, GroupForm, RecordForm,
                     BlacklistItemForm, RuleForm, VlanGroupForm, SwitchPortForm)
                     BlacklistItemForm, RuleForm, VlanGroupForm, SwitchPortForm)
 
 
 from django.contrib import messages
 from django.contrib import messages
+from django.contrib.messages.views import SuccessMessageMixin
 from django.views.generic.edit import FormMixin
 from django.views.generic.edit import FormMixin
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_lazy as _
 from braces.views import LoginRequiredMixin, SuperuserRequiredMixin
 from braces.views import LoginRequiredMixin, SuperuserRequiredMixin
@@ -45,22 +46,11 @@ from dashboard.views import AclUpdateView
 from dashboard.forms import AclUserAddForm
 from dashboard.forms import AclUserAddForm
 
 
 
 
-class SuccessMessageMixin(FormMixin):
-    """
-    Adds a success message on successful form submission.
-    From django/contrib/messages/views.py@9a85ad89
-    """
-    success_message = ''
-
-    def form_valid(self, form):
-        response = super(SuccessMessageMixin, self).form_valid(form)
-        success_message = self.get_success_message(form.cleaned_data)
-        if success_message:
-            messages.success(self.request, success_message)
-        return response
-
-    def get_success_message(self, cleaned_data):
-        return self.success_message % cleaned_data
+class InitialOwnerMixin(FormMixin):
+    def get_initial(self):
+        initial = super(InitialOwnerMixin, self).get_initial()
+        initial['owner'] = self.request.user
+        return initial
 
 
 
 
 class IndexView(LoginRequiredMixin, SuperuserRequiredMixin, TemplateView):
 class IndexView(LoginRequiredMixin, SuperuserRequiredMixin, TemplateView):
@@ -190,7 +180,7 @@ class DomainDetail(LoginRequiredMixin, SuperuserRequiredMixin,
 
 
 
 
 class DomainCreate(LoginRequiredMixin, SuperuserRequiredMixin,
 class DomainCreate(LoginRequiredMixin, SuperuserRequiredMixin,
-                   SuccessMessageMixin, CreateView):
+                   SuccessMessageMixin, InitialOwnerMixin, CreateView):
     model = Domain
     model = Domain
     template_name = "network/domain-create.html"
     template_name = "network/domain-create.html"
     form_class = DomainForm
     form_class = DomainForm
@@ -274,7 +264,7 @@ class GroupList(LoginRequiredMixin, SuperuserRequiredMixin, SingleTableView):
 
 
 
 
 class GroupCreate(LoginRequiredMixin, SuperuserRequiredMixin,
 class GroupCreate(LoginRequiredMixin, SuperuserRequiredMixin,
-                  SuccessMessageMixin, CreateView):
+                  SuccessMessageMixin, InitialOwnerMixin, CreateView):
     model = Group
     model = Group
     template_name = "network/group-create.html"
     template_name = "network/group-create.html"
     form_class = GroupForm
     form_class = GroupForm
@@ -413,7 +403,7 @@ class HostDetail(LoginRequiredMixin, SuperuserRequiredMixin,
 
 
 
 
 class HostCreate(LoginRequiredMixin, SuperuserRequiredMixin,
 class HostCreate(LoginRequiredMixin, SuperuserRequiredMixin,
-                 SuccessMessageMixin, CreateView):
+                 SuccessMessageMixin, InitialOwnerMixin, CreateView):
     model = Host
     model = Host
     template_name = "network/host-create.html"
     template_name = "network/host-create.html"
     form_class = HostForm
     form_class = HostForm
@@ -497,7 +487,7 @@ class RecordDetail(LoginRequiredMixin, SuperuserRequiredMixin,
 
 
 
 
 class RecordCreate(LoginRequiredMixin, SuperuserRequiredMixin,
 class RecordCreate(LoginRequiredMixin, SuperuserRequiredMixin,
-                   SuccessMessageMixin, CreateView):
+                   SuccessMessageMixin, InitialOwnerMixin, CreateView):
     model = Record
     model = Record
     template_name = "network/record-create.html"
     template_name = "network/record-create.html"
     form_class = RecordForm
     form_class = RecordForm
@@ -505,10 +495,9 @@ class RecordCreate(LoginRequiredMixin, SuperuserRequiredMixin,
     success_message = _(u'Successfully created record!')
     success_message = _(u'Successfully created record!')
 
 
     def get_initial(self):
     def get_initial(self):
-        return {
-            # 'owner': 1,
-            'domain': self.request.GET.get('domain'),
-        }
+        initial = super(RecordCreate, self).get_initial()
+        initial['domain'] = self.request.GET.get('domain')
+        return initial
 
 
 
 
 class RecordDelete(LoginRequiredMixin, SuperuserRequiredMixin, DeleteView):
 class RecordDelete(LoginRequiredMixin, SuperuserRequiredMixin, DeleteView):
@@ -556,18 +545,19 @@ class RuleDetail(LoginRequiredMixin, SuperuserRequiredMixin,
 
 
 
 
 class RuleCreate(LoginRequiredMixin, SuperuserRequiredMixin,
 class RuleCreate(LoginRequiredMixin, SuperuserRequiredMixin,
-                 SuccessMessageMixin, CreateView):
+                 SuccessMessageMixin, InitialOwnerMixin, CreateView):
     model = Rule
     model = Rule
     template_name = "network/rule-create.html"
     template_name = "network/rule-create.html"
     form_class = RuleForm
     form_class = RuleForm
     success_message = _(u'Successfully created rule!')
     success_message = _(u'Successfully created rule!')
 
 
     def get_initial(self):
     def get_initial(self):
-        return {
-            # 'owner': 1,
+        initial = super(RuleCreate, self).get_initial()
+        initial.update({
             'host': self.request.GET.get('host'),
             'host': self.request.GET.get('host'),
             'hostgroup': self.request.GET.get('hostgroup')
             'hostgroup': self.request.GET.get('hostgroup')
-        }
+        })
+        return initial
 
 
 
 
 class RuleDelete(LoginRequiredMixin, SuperuserRequiredMixin, DeleteView):
 class RuleDelete(LoginRequiredMixin, SuperuserRequiredMixin, DeleteView):
@@ -747,7 +737,7 @@ class VlanGroupDetail(LoginRequiredMixin, SuperuserRequiredMixin,
 
 
 
 
 class VlanGroupCreate(LoginRequiredMixin, SuperuserRequiredMixin,
 class VlanGroupCreate(LoginRequiredMixin, SuperuserRequiredMixin,
-                      SuccessMessageMixin, CreateView):
+                      SuccessMessageMixin, InitialOwnerMixin, CreateView):
     model = VlanGroup
     model = VlanGroup
     template_name = "network/vlan-group-create.html"
     template_name = "network/vlan-group-create.html"
     form_class = VlanGroupForm
     form_class = VlanGroupForm