Fixed crash in /svn URL
authorSybren A. Stüvel <sybren@stuvel.eu>
Thu, 30 Aug 2018 08:55:49 +0000 (10:55 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Thu, 30 Aug 2018 08:55:49 +0000 (10:55 +0200)
- The change in Pillar commit a7693aa78dcf0a0a77e113f34afa63fb4f615441
  was never applied to this project.
- The `pillar.web` URL name prefix for Pillar URLs was apparently removed.

The /svn page still looks bad, but at least it doesn't crash any more.

src/templates/svnman/index.pug
src/templates/svnman/layout.pug

index 3561b70..836e549 100644 (file)
@@ -24,7 +24,7 @@ style.
 
                | {% for proj in projects._items %}
                h4
-                       a(href="{{ url_for('pillar.web.projects.edit_extension', project_url=proj.url, extension='svnman') }}") {{ proj.name }}
+                       a(href="{{ url_for('projects.edit_extension', project_url=proj.url, extension_name='svnman') }}") {{ proj.name }}
                | {% else %}
                h4 No Subversion repositories
 
index b2fc7d7..5ca3578 100644 (file)
@@ -37,9 +37,8 @@ html(lang="en")
                                                                i.pi-svnman
                                        ul.bottom
 
-                                               | {% from '_macros/_menu.html' import navigation_menu_notifications, navigation_menu_user %}
-                                               | {{ navigation_menu_notifications(current_user) }}
-                                               | {{ navigation_menu_user(current_user) }}
+                                               | {% include 'menus/notifications.html' %}
+                                               | {% include 'menus/user.html' %}
 
                        | {% block body %}
                        #col_left