Changeset 633:97f997bee4d2

Timestamp:

23/06/12 18:10:45 (11 months ago)

Author:

nicoechaniz <nicoechaniz@…>

Branch:

default

rebase_source:

49f9ef093fa7f906e34e53746183468c471d694e

Message:

partial frontend edit implementation

Location:

cyclope

Files:

• admin.py (modified) (2 diffs)
• apps/articles/templates/articles/article_detail.html (modified) (1 diff)
• core/collections/templates/collections/category_contents_base.html (modified) (1 diff)
• templates/cyclope/content_tools_block.html (modified) (1 diff)

cyclope/admin.py

@@ -34 +34 @@
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.comments.admin import CommentsAdmin
+from django.http import HttpResponseRedirect
 
 from feincms.admin import editor
@@ -73 +74 @@
         )
 
+    def response_change(self, request, obj):
+        if '_frontend' in request.REQUEST:
+            return HttpResponseRedirect(obj.get_absolute_url())
+        return super(BaseContentAdmin, self).response_change(request, obj)
 
+    def response_add(self, request, obj, post_url_continue='../%s/'):
+        if '_frontend' in request.REQUEST:
+            return HttpResponseRedirect(obj.get_absolute_url())
+        return super(UserAdmin, self).response_add(request, obj, post_url_continue)
+
+
+        
 from django.utils.functional import update_wrapper
 

cyclope/apps/articles/templates/articles/article_detail.html

@@ -5 +5 @@
 {% block content %}
 {% alias article as 'current_object' %}
+
+{% alias perms.articles.change_article as 'user_has_edit_perm' %}
+
 <div class="content-view article detail article-detail">
 

cyclope/core/collections/templates/collections/category_contents_base.html

@@ -4 +4 @@
 
 {% block content %}
+
+  {% if perms.collections.add_categorization %}
+  <div class="category_add_content">
+    <a href="{% url category-default category.slug %}">Add content</a>
+    <ul class="content_types">
+      {% for c_type in category.collection.content_types.all %}
+      <li>
+        <a href="/admin/{{ c_type.app_label }}/{{ c_type.model }}/add?_frontend=1" class="add_content add_{{ c_type.model }}">
+          {{ c_type.name.capitalize }}
+        </a>
+      </li>
+      {% endfor %}
+    </ul>
+  </div>
+  {% endif %}
+
   {% if view_options.navigation == "TOP" %}
     {% include 'collections/hierarchycal_navigation_block.html' %}

cyclope/templates/cyclope/content_tools_block.html

@@ -4 +4 @@
   <div class="tools meta-content">
     <ul>
-      <li class="first"><a href="javascript:window.print()" class="print">{% trans "Print" %}</a></li>
+      <li class="first"><a href="javascript:window.print()" class="print">{% trans "Print" %}</a>
+      </li>
       {% if current_object.allow_comments == 'YES' or current_object.allow_comments == 'SITE' and CYCLOPE_SITE_SETTINGS.allow_comments == 'YES' %}
-        {% if comment_count %}
-        <li>
-          <a href="#comments" class="comments_link">{% trans "Comments" %} ({{ comment_count }})</a>
-        </li>
-        {% endif %}
+      {% if comment_count %}
+      <li>
+        <a href="#comments" class="comments_link">{% trans "Comments" %} ({{ comment_count }})</a>
+      </li>
+      {% endif %}
+      {% endif %}
+      {% if user_has_edit_perm %}
+      <li>
+        <a href="/admin/{{ current_object.get_app_label }}/{{ current_object.get_object_name }}/{{current_object.pk }}?_frontend=1" class="edit_link">
+          {% trans "Edit" %}
+        </a>
+      </li>
       {% endif %}
     </ul>