changeset 2294:e615e3bbe48d

Fixed broken links.
author Ashutosh Singla <ashu1461@gmail.com>
date Mon, 23 Sep 2013 19:29:32 +0530
parents e5d44d1b9976
children b12a05722ced
files MoinMoin/apps/admin/templates/admin/trash.html MoinMoin/apps/frontend/views.py MoinMoin/templates/delete.html MoinMoin/templates/rename.html
diffstat 4 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/apps/admin/templates/admin/trash.html	Sun Sep 22 21:27:05 2013 +0530
+++ b/MoinMoin/apps/admin/templates/admin/trash.html	Mon Sep 23 19:29:32 2013 +0530
@@ -27,7 +27,7 @@
                     <td class="moin-wordbreak">{{ result.comment }}</td>
                     <td><a href="{{ url_for('frontend.show_item', item_name=result.fqname) }}">{{ _('show') }}</a></td>
                     {% if user.may.write(result.fqname) -%}
-                    <td><a href="{{ url_for('frontend.show_item', item_name=result.fqname) }}">{{ _('History') }}</a></td>
+                    <td><a href="{{ url_for('frontend.history', item_name=result.fqname) }}">{{ _('History') }}</a></td>
                     <td><a href="{{ url_for('frontend.destroy_item', item_name=result.fqname) }}">{{ _('Destroy') }}</a></td>
                     {%- endif %}
                 </tr>
--- a/MoinMoin/apps/frontend/views.py	Sun Sep 22 21:27:05 2013 +0530
+++ b/MoinMoin/apps/frontend/views.py	Mon Sep 23 19:29:32 2013 +0530
@@ -556,7 +556,7 @@
         Check whether the names present in the previous meta are not taken by some other item.
         """
         try:
-            validate_name(state['meta'], state[FQNAME], state['meta'].get(ITEMID))
+            validate_name(state['meta'], state['meta'].get(ITEMID))
             return True
         except NameNotValidError as e:
             self.invalid_name_msg = _(e)
--- a/MoinMoin/templates/delete.html	Sun Sep 22 21:27:05 2013 +0530
+++ b/MoinMoin/templates/delete.html	Mon Sep 23 19:29:32 2013 +0530
@@ -1,12 +1,12 @@
 {% import "forms.html" as forms %}
 {% extends theme("show.html") %}
 
-{% set title = _("Delete '%(item_name)s'", item_name=item.name) %}
+{% set title = _("Delete '%(item_name)s'", item_name=fqname.value) %}
 
 {% block content %}
 <h1>{{ title }}</h1>
 <div class="moin-form">
-{{ gen.form.open(form, method="post", action=url_for('frontend.delete_item', item_name=item.name)) }}
+{{ gen.form.open(form, method="post", action=url_for('frontend.delete_item', item_name=fqname)) }}
   {{ forms.render_errors(form) }}
   <dl>
     {{ forms.render(form['comment']) }}
--- a/MoinMoin/templates/rename.html	Sun Sep 22 21:27:05 2013 +0530
+++ b/MoinMoin/templates/rename.html	Mon Sep 23 19:29:32 2013 +0530
@@ -1,12 +1,11 @@
 {% import "forms.html" as forms %}
 {% extends theme("show.html") %}
 
-{% set title = _("Rename '%(item_name)s'", item_name=item.name) %}
-
+{% set title = _("Rename '%(item_name)s'", item_name=item.fqname.value) %}
 {% block content %}
 <h1>{{ title }}</h1>
 <div class="moin-form">
-{{ gen.form.open(form, method="post", action=url_for('frontend.rename_item', item_name=item.name)) }}
+{{ gen.form.open(form, method="post", action=url_for('frontend.rename_item', item_name=fqname)) }}
   {{ forms.render_errors(form) }}
   <dl>
     {{ forms.render(form['target']) }}