Merge pull request #205 from editorsnotes/fix-editing-bugs

Fix editing bugs

Author: ptgolden

editorsnotes/admin_custom/forms/topics.py

@@ -16,7 +16,7 @@ class Media:
         )
     class Meta:
         model = Topic
-        fields = ('preferred_name', 'topic_type', 'topic_node',)
+        fields = ('preferred_name', 'topic_type',)
         widgets = {
             'topic': forms.HiddenInput()
         }
@@ -25,19 +25,6 @@ def __init__(self, *args, **kwargs):
         instance = kwargs.get('instance', None)
         if instance is not None:
             self.fields['topic_type'].initial = instance.topic.type
-            self.fields['topic'] = instance.topic_node_id
-    def clean_topic_node(self):
-        data = self.cleaned_data['topic_node']
-        if getattr(self, 'instance', None):
-            if self.instance.topic_node_id != int(data):
-                raise ValidationError(
-                    'Topic node input can not be changed from this form. '
-                    'To change the topic node, use the merge function.')
-        elif data:
-            if not TopicNode.objects.filter(id=data).exists():
-                msg = 'TopicNode with id {} does not exist.'.format(data)
-                raise ValidationError(msg)
-        return data
 
 AlternateNameFormset = models.inlineformset_factory(
     Topic, AlternateName, fields=('name',), extra=1)

editorsnotes/admin_custom/templates/project_roles.html

@@ -114,18 +114,6 @@
 
 {% block content %}
 
-  <ul class="breadcrumb-top">
-    <li>
-      <a href="{% url "project_view" project_slug=project.slug %}">{{ project }}</a>
-      <span class="divider">&gt;</span>
-    </li>
-    <li>
-      <a href="{% url "admin:main_project_roster_change" project_slug=project.slug %}">Roster</a>
-      <span class="divider">&gt;</span>
-    </li>
-    <li class="active">Roles</li>
-  </ul>
-
 <h1>Change project roles</h1>
 {% include "includes/bootstrap_errors.html" with errors=formset.errors %}
 <form method="post">

editorsnotes/admin_custom/templates/project_roster.html

@@ -46,14 +46,6 @@
 
 {% block content %}
 
-  <ul class="breadcrumb-top">
-    <li>
-      <a href="{% url "project_view" project_slug=project.slug %}">{{ project }}</a>
-      <span class="divider">&gt;</span>
-    </li>
-    <li class="active">Roster</li>
-  </ul>
-
   {% if roster_formset %}
   <form method="post">
     <div style="display: none;">

editorsnotes/admin_custom/views/common.py

@@ -79,7 +79,11 @@ def dispatch(self, *args, **kwargs):
     def get_context_data(self, **kwargs):
         context = super(BaseAdminView, self).get_context_data(**kwargs)
         context['project'] = self.project
+        context['breadcrumb'] = self.get_breadcrumb()
         return context
+    def get_breadcrumb(self):
+        "Override this method with (label, url) pairs to generate page breadcrumb."
+        return ()
     def get(self, request, *args, **kwargs):
         self.object = self.get_object(**kwargs)
         self.check_perms()

editorsnotes/admin_custom/views/documents.py

@@ -1,5 +1,6 @@
 import json
 
+from django.core.urlresolvers import reverse
 from django.http import HttpResponse, HttpResponseForbidden
 from django.shortcuts import get_object_or_404
 import reversion
@@ -27,6 +28,23 @@ def get_object(self, document_id=None):
         return document_id and get_object_or_404(
             Document, id=document_id, project_id=self.project.id)
 
+    def get_breadcrumb(self):
+        breadcrumbs = (
+            (self.project.name, self.project.get_absolute_url()),
+            ('Documents', reverse('all_documents_view',
+                               kwargs={'project_slug': self.project.slug})),
+        )
+        if self.object is None:
+            breadcrumbs += (
+                ('Add', None),
+            )
+        else:
+            breadcrumbs += (
+                (self.object.as_text(), self.object.get_absolute_url()),
+                ('Edit', None)
+            )
+        return breadcrumbs
+
     def save_object(self, form, formsets):
         obj, action = super(DocumentAdminView, self).save_object(form, formsets)
         form.save_zotero_data()

editorsnotes/admin_custom/views/notes.py

@@ -2,6 +2,7 @@
 
 from django.contrib import messages
 from django.core.exceptions import PermissionDenied
+from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render_to_response
 from django.template import RequestContext
@@ -20,16 +21,32 @@ class NoteAdminView(BaseAdminView):
         # forms.TopicAssignmentFormset,
     )
     template_name = 'note_admin.html'
+    def get_object(self, note_id=None):
+        return note_id and get_object_or_404(
+            Note, id=note_id, project_id=self.project.id)
+    def get_breadcrumb(self):
+        breadcrumbs = (
+            (self.project.name, self.project.get_absolute_url()),
+            ('Notes', reverse('all_notes_view',
+                               kwargs={'project_slug': self.project.slug})),
+        )
+        if self.object is None:
+            breadcrumbs += (
+                ('Add', None),
+            )
+        else:
+            breadcrumbs += (
+                (self.object.as_text(), self.object.get_absolute_url()),
+                ('Edit', None)
+            )
+        return breadcrumbs
     def set_additional_object_properties(self, obj, form):
         obj.project = self.project
         return obj
     def get_form(self, form_class):
         form = form_class(**self.get_form_kwargs())
         form.fields['assigned_users'].queryset = self.project.members.all()
         return form
-    def get_object(self, note_id=None):
-        return note_id and get_object_or_404(
-            Note, id=note_id, project_id=self.project.id)
     def save_formset_form(self, form):
         obj = form.save(commit=False)
         obj.note = self.object

editorsnotes/admin_custom/views/projects.py

@@ -3,6 +3,7 @@
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.contrib.contenttypes.models import ContentType
+from django.core.urlresolvers import reverse
 from django.http import (
     HttpResponseForbidden, HttpResponseRedirect, HttpResponseBadRequest)
 from django.shortcuts import get_object_or_404, render_to_response
@@ -27,6 +28,11 @@ def project_roster(request, project_slug):
                             'roles__group__users')
     project = get_object_or_404(project_qs, slug=project_slug)
 
+    o['breadcrumb'] = (
+        (project.name, project.get_absolute_url()),
+        ('Roster', None)
+    )
+
     can_view = user.has_project_perm(project, 'main.view_project_roster')
     if not can_view:
         return HttpResponseForbidden(VIEW_ERROR_MSG.format(project))
@@ -148,6 +154,13 @@ def change_project_roles(request, project_slug):
 
     o['project'] = project = get_object_or_404(Project, slug=project_slug)
 
+    o['breadcrumb'] = (
+        (project.name, project.get_absolute_url()),
+        ('Roster', reverse('admin:main_project_roster_change',
+                           kwargs={'project_slug': project.slug})),
+        ('Roles', None),
+    )
+
     can_view = request.user.has_project_perm(project, 'main.change_project_roster')
     if not can_view:
         return HttpResponseForbidden(VIEW_ERROR_MSG.format(project))

editorsnotes/admin_custom/views/topics.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*- 
 
+from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404
 
 from editorsnotes.main.models import Topic, TopicNode
@@ -20,17 +21,35 @@ class TopicAdminView(BaseAdminView):
     def get_object(self, topic_node_id=None):
         return topic_node_id and get_object_or_404(
             Topic, topic_node_id=topic_node_id, project__slug=self.project.slug)
+    def get_breadcrumb(self):
+        breadcrumbs = (
+            (self.project.name, self.project.get_absolute_url()),
+            ('Topics', reverse('all_topics_view',
+                               kwargs={'project_slug': self.project.slug})),
+        )
+        if self.object is None:
+            breadcrumbs += (
+                ('Add', None),
+            )
+        else:
+            breadcrumbs += (
+                (self.object.as_text(), self.object.get_absolute_url()),
+                ('Edit', None)
+            )
+        return breadcrumbs
     def set_additional_object_properties(self, obj, form):
         if not obj.id:
-            if form.cleaned_data['topic_node']:
-                topic_node = TopicNode.objects.get(
-                    id=form.cleaned_data['topic_node'])
+            existing_node_id = self.request.GET.get('topic_node')
+            if existing_node_id:
+                topic_node = get_object_or_404(TopicNode, id=existing_node_id)
             else:
                 topic_node = TopicNode.objects.create(
                     _preferred_name=obj.preferred_name,
-                    type=form.cleaned_data['topic_type'])
+                    type=form.cleaned_data['topic_type'],
+                    creator=self.request.user,
+                    last_updater=self.request.user)
             obj.topic_node_id = topic_node.id
-            obj.project = self.project
+            obj.project_id = self.project.id
         return obj
     def save_citation_formset_form(self, form):
         obj = form.save(commit=False)