diff --git a/crowdataapp/admin.py b/crowdataapp/admin.py index f0689a4..59b0eaa 100644 --- a/crowdataapp/admin.py +++ b/crowdataapp/admin.py @@ -350,7 +350,7 @@ class DocumentSetFormEntryInline(admin.TabularInline): extra = 0 def answers(self, obj): - field_template = "
  • %s: %s - %s
  • " + field_template = "
  • %s: %s - %s
  • " rv = '' - return mark_safe(rv) - def user_link(self, obj): url = reverse('admin:auth_user_change', args=(obj.user.id,)) return mark_safe('%s' % (url, obj.user.get_full_name())) @@ -488,6 +487,12 @@ class Media: readonly_fields = ('last_login', 'date_joined', ) +class DocumentSetFieldEntryAdmin(admin.ModelAdmin): + def get_model_perms(self, request): + """ + Return empty perms dict thus hiding the model from admin index. + """ + return {} admin.site.register(models.DocumentSet, DocumentSetAdmin) admin.site.register(models.Document, DocumentAdmin) @@ -495,6 +500,8 @@ class Media: admin.site.register(models.CanonicalFieldEntryLabel, CanonicalFieldEntryLabelAdmin) +admin.site.register(models.DocumentSetFieldEntry, DocumentSetFieldEntryAdmin) + admin.site.unregister(User) admin.site.register(User, CrowDataUserAdmin) diff --git a/crowdataapp/models.py b/crowdataapp/models.py index 7c37982..44739c1 100644 --- a/crowdataapp/models.py +++ b/crowdataapp/models.py @@ -209,6 +209,10 @@ class DocumentSetForm(forms_builder.forms.models.AbstractForm): def get_absolute_url(self): return ('crowdata_form_detail', (), { 'slug': self.slug }) + # def __unicode__(self): + # return self.document_set.name + + class DocumentSetFormFieldManager(models.Manager): """ Only show visible fields when displaying actual form.. @@ -288,6 +292,10 @@ def force_verify(self): self.document.verified = True self.document.save() + # def __unicode__(self): + # return self.value + + class DocumentSetFieldEntry(forms_builder.forms.models.AbstractFieldEntry): entry = models.ForeignKey("DocumentSetFormEntry", related_name="fields") verified = models.BooleanField(default=False, null=False) @@ -647,3 +655,6 @@ def reassign_entries_to(self, new_canon): for entry in self.fields.all(): entry.canonical_label = new_canon entry.save_without_setting_canon() + + def __unicode__(self): + return self.value