TRAC#7497 Adds the page update view

app/comicsite/templates/mainpage.html

@@ -46,15 +46,14 @@
         <br/>
 
         {% get_obj_perms user for site as "site_perms" %}
-        {% if "change_comicsite" in site_perms or request.user.is_superuser %}
+        {% if "change_comicsite" in site_perms %}
 
             <a class="editPageLink"
-               href="{% url 'admin:comicmodels_page_change' currentpage.pk %}">Edit
-                this page</a>
+               href="{% url 'pages:update' currentpage.comicsite.short_name currentpage.title %}">
+                Edit this page
+            </a>
         {% endif %}
 
-
     {% endblock %}
 
-
 {% endblock %}

app/comicsite/templates/page.html

@@ -58,9 +58,9 @@
     {% if not currentpage.is_error_page %}
         {% block editlink %}
             {% if currentpage.pk %}
-                {% if "change_comicsite" in site_perms or request.user.is_superuser %}
+                {% if "change_comicsite" in site_perms %}
                     <a class="editPageLink"
-                       href="{% url 'admin:comicmodels_page_change' currentpage.pk %}">Edit
+                       href="{% url 'pages:update' currentpage.comicsite.short_name currentpage.title %}">Edit
                         this
                         page</a>
 

app/pages/forms.py

@@ -6,16 +6,6 @@
 
 
 class PageCreateForm(forms.ModelForm):
-    move = forms.CharField(widget=forms.Select)
-    move.required = False
-    move.widget.choices = (
-        (BLANK_CHOICE_DASH[0]),
-        ('FIRST', 'First'),
-        ('UP', 'Up'),
-        ('DOWN', 'Down'),
-        ('LAST', 'Last'),
-    )
-
     def __init__(self, *args, **kwargs):
         challenge_name = kwargs.pop('challenge_short_name', None)
 
@@ -29,3 +19,16 @@ def __init__(self, *args, **kwargs):
     class Meta:
         model = Page
         fields = ('title', 'permission_lvl', 'display_title', 'hidden', 'html')
+
+
+class PageUpdateForm(PageCreateForm):
+    """ Like the page update form but you can also move the page """
+    move = forms.CharField(widget=forms.Select)
+    move.required = False
+    move.widget.choices = (
+        (BLANK_CHOICE_DASH[0]),
+        ('FIRST', 'First'),
+        ('UP', 'Up'),
+        ('DOWN', 'Down'),
+        ('LAST', 'Last'),
+    )

app/pages/templates/comicmodels/page_list.html

@@ -39,14 +39,17 @@ <h2>Pages for {{ site.short_name }}</h2>
                     <a href="{{ page.get_absolute_url }}">View {{ page.title }}</a>
                 </td>
                 <td>
-                    <i class="fa fa-edit" title="edit"></i>
+                    <a href="{% url 'pages:update' site.short_name page.title %}">
+                        <i class="fa fa-edit" title="edit"></i>
+                    </a>
                 </td>
             </tr>
         {% endfor %}
         </tbody>
     </table>
 
-    <p><a class="btn btn-primary" href="{% url 'pages:create' site.short_name %}">
+    <p><a class="btn btn-primary"
+          href="{% url 'pages:create' site.short_name %}">
         <i class="fa fa-plus"></i> Add a new page
     </a></p>
 

app/pages/urls.py

@@ -5,12 +5,15 @@
     insertedpage,
     PageList,
     PageCreate,
+    PageUpdate,
 )
 
 urlpatterns = [
     url(r'^pages/$', PageList.as_view(), name='list'),
     url(r'^pages/create/$', PageCreate.as_view(), name='create'),
     url(r'^(?P<page_title>[\w-]+)/$', page, name='detail'),
+    url(r'^(?P<page_title>[\w-]+)/update/$', PageUpdate.as_view(), name='update'),
+
     url(r'^(?P<page_title>[\w-]+)/insert/(?P<dropboxpath>.+)/$', insertedpage,
         name='insert-detail'),
 ]

app/pages/views.py

@@ -6,7 +6,7 @@
 from django.db.models import Q
 from django.http import Http404, HttpResponseForbidden
 from django.shortcuts import render, get_object_or_404
-from django.views.generic import ListView, CreateView
+from django.views.generic import ListView, CreateView, UpdateView
 
 from comicmodels.models import Page, ComicSite
 from comicsite.core.urlresolvers import reverse
@@ -18,7 +18,7 @@
 )
 from filetransfers.api import serve_file
 from filetransfers.views import can_access
-from pages.forms import PageCreateForm
+from pages.forms import PageCreateForm, PageUpdateForm
 
 
 class PageCreate(UserIsChallengeAdminMixin, CreateView):
@@ -27,9 +27,7 @@ class PageCreate(UserIsChallengeAdminMixin, CreateView):
 
     def get_form_kwargs(self):
         kwargs = super(PageCreate, self).get_form_kwargs()
-
         kwargs.update({'challenge_short_name': self.request.projectname})
-
         return kwargs
 
     def form_valid(self, form):
@@ -43,10 +41,16 @@ class PageList(UserIsChallengeAdminMixin, ListView):
 
     def get_queryset(self):
         queryset = super(PageList, self).get_queryset()
-
         return queryset.filter(Q(comicsite__pk=self.request.project_pk))
 
 
+class PageUpdate(UserIsChallengeAdminMixin, UpdateView):
+    model = Page
+    form_class = PageUpdateForm
+    slug_url_kwarg = 'page_title'
+    slug_field = 'title'
+
+
 def page(request, challenge_short_name, page_title):
     """ show a single page on a site """
 

app/tests/pages_tests/test_pages.py

@@ -23,6 +23,19 @@ def test_page_admin_permissions(view, client, TwoChallengeSets):
     )
 
 
+@pytest.mark.django_db
+def test_page_update_permissions(client, TwoChallengeSets):
+    p1 = PageFactory(comicsite=TwoChallengeSets.ChallengeSet1.challenge,
+                     title='challenge1page1permissiontest')
+
+    validate_admin_only_view(
+        viewname='pages:update',
+        two_challenge_set=TwoChallengeSets,
+        client=client,
+        reverse_kwargs={'page_title': p1.title},
+    )
+
+
 @pytest.mark.django_db
 def test_page_list_filter(client, TwoChallengeSets):
     """ Check that only pages related to this challenge are listed """
@@ -52,6 +65,7 @@ def test_page_list_filter(client, TwoChallengeSets):
     assert p1.title not in response.rendered_content
     assert p2.title in response.rendered_content
 
+
 @pytest.mark.django_db
 def test_page_create(client, TwoChallengeSets):
     page_html = '<h1>HELLO WORLD</h1>'
@@ -101,5 +115,3 @@ def test_page_create(client, TwoChallengeSets):
     )
 
     assert response.status_code == 404
-
-