fix order in billsegment admin

LAB-Rio · May 12, 2016 · fd9b967 · fd9b967
1 parent 9584774
commit fd9b967
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/wikilegis/core/admin.py b/wikilegis/core/admin.py
@@ -228,6 +228,16 @@ class BillSegmentAdmin(admin.ModelAdmin):
         (None, {'fields': ['bill', 'order', 'parent', 'type', 'number', 'content']})
     ]
 
+    def formfield_for_dbfield(self, db_field, **kwargs):
+        field = super(BillSegmentAdmin, self).formfield_for_dbfield(db_field, **kwargs)
+        if db_field.name == 'order':
+            try:
+                field.initial = BillSegment.objects.filter(bill_id=Bill.objects.all().last().id).aggregate(Max('order'))['order__max'] + 1
+            except:
+                field.initial = 1
+        return field
+
+
 
 admin.site.register(BillSegment, BillSegmentAdmin)
 admin.site.register(models.Bill, BillAdmin)

diff --git a/wikilegis/core/forms.py b/wikilegis/core/forms.py
@@ -231,10 +231,6 @@ class Meta:
 class BillSegmentAdminForm(forms.ModelForm):
     bill = forms.ModelChoiceField(label=_('bill'), queryset=Bill.objects.all(), initial=Bill.objects.latest('id').id)
     parent = forms.ModelChoiceField(label=_('segment parent'), queryset=BillSegment.objects.filter(bill_id=Bill.objects.latest('id').id, original=True).order_by('-id'), required=False)
-    try:
-        order = forms.CharField(label=_('order'), initial=BillSegment.objects.filter(bill_id=Bill.objects.latest('id').id).aggregate(Max('order'))['order__max'] + 1)
-    except:
-        order = forms.CharField(label=_('order'), initial=1)
 
     class Meta:
         model = BillSegment