repos: Fix editinig repos

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/repos/edit.html b/src/templates/repos/edit.html
index ebacae6323240af065f664787673331302c400cb..b6170d7481becad1b8c9db108df98df309a5c24a 100644 (file)
--- a/src/templates/repos/edit.html
+++ b/src/templates/repos/edit.html
@@ -1,10 +1,10 @@
-{% extends "../base.html" %}
+{% extends "base.html" %}
 
-{% block title %}{{ _("Repositories") }} - {{ repo }} - {{ _("Edit") }}{% end block %}
+{% block title %}{{ _("Repositories") }} - {{ repo }} - {{ _("Edit") }}{% endblock %}
 
 {% block container %}
-       <nav aria-label="{{ _("You are here:") }}" role="navigation">
-               <ul class="breadcrumbs">
+       <nav class="breadcrumb" aria-label="breadcrumbs">
+               <ul>
                        <li>
                                <a href="/">{{ _("Home") }}</a>
                        </li>
@@ -28,7 +28,7 @@
                                <li>
                                        <a href="/distros/{{ repo.distro.slug }}">{{ repo.distro }}</a>
                                </li>
-                       {% end %}
+                       {% endif %}
                        <li>
                                {{ _("Repositories") }}
                        </li>
@@ -38,7 +38,7 @@
                                </a>
                        </li>
                        <li>
-                               <span class="show-for-sr">{{ _("Current") }}: </span> {{ _("Edit") }}
+                               {{ _("Edit") }}
                        </li>
                </ul>
        </nav>
@@ -47,7 +47,7 @@
                <div class="cell large-6 float-center">
                        <form method="POST" action="">
                                <div class="callout">
-                                       {% raw xsrf_form_html() %}
+                                       {{ xsrf_form_html() | safe }}
 
                                        <label>
                                                {{ _("Name") }}
@@ -75,25 +75,25 @@
 
                                        {% if repo.owner %}
                                                <input id="listed" type="checkbox" name="listed"
-                                                       {% if repo.listed %}checked{% end %} aria-describedby="listed-help">
+                                                       {% if repo.listed %}checked{% endif %} aria-describedby="listed-help">
 
                                                <label for="listed">{{ _("Listed") }}</label>
 
                                                <p class="help-text" id="listed-help">
                                                        {{ _("By unchecking this box, you can hide this repository from being listed") }}
                                                </p>
-                                       {% end %}
+                                       {% endif %}
 
                                        {% if current_user.is_admin() %}
                                                <input id="mirrored" type="checkbox" name="mirrored"
-                                                       {% if repo.mirrored %}checked{% end %} aria-describedby="mirrored-help">
+                                                       {% if repo.mirrored %}checked{% endif %} aria-describedby="mirrored-help">
 
                                                <label for="mirrored">{{ _("Enable Mirroring") }}</label>
 
                                                <p class="help-text" id="mirrored-help">
                                                        {{ _("If enabled, this repository will be made available on mirror servers") }}
                                                </p>
-                                       {% end %}
+                                       {% endif %}
                                </div>
 
                                <button class="success button expanded" type="submit">{{ _("Save") }}</button>
@@ -104,4 +104,4 @@
                        </form>
                </div>
        </div>
-{% end block %}
+{% endblock %}

diff --git a/src/web/repos.py b/src/web/repos.py
index d7fa976f55a7f93a405a0eadbecc9b20163f858f..ecdd697742324b7ec4a97e9685d987f3229145cf 100644 (file)
--- a/src/web/repos.py
+++ b/src/web/repos.py
@@ -204,26 +204,26 @@ class ConfigHandler(BaseHandler):
 
 class EditHandler(BaseHandler):
        @base.authenticated
-       def get(self, **kwargs):
+       async def get(self, **kwargs):
                # Fetch the repository
-               repo = self._get_repo(**kwargs)
+               repo = await self._get_repo(**kwargs)
 
                # Check for permissions
                if not repo.has_perm(self.current_user):
                        raise tornado.web.HTTPError(403, "%s cannot edit this repository" % self.current_user)
 
-               self.render("repos/edit.html", repo=repo)
+               await self.render("repos/edit.html", repo=repo)
 
        @base.authenticated
-       def post(self, **kwargs):
+       async def post(self, **kwargs):
                # Fetch the repository
-               repo = self._get_repo(**kwargs)
+               repo = await self._get_repo(**kwargs)
 
                # Check for permissions
                if not repo.has_perm(self.current_user):
                        raise tornado.web.HTTPError(403, "%s cannot edit this repository" % self.current_user)
 
-               with self.db.transaction():
+               async with await self.db.transaction():
                        repo.name        = self.get_argument("name")
                        repo.description = self.get_argument("description", None)
                        repo.priority    = self.get_argument_int("priority", None)