From d21db589ff047f93090b0d972cba634b1cea972e Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Oct 07 2014 08:10:10 +0000 Subject: Improve package adding view --- diff --git a/koschei/views.py b/koschei/views.py index 73adcfe..1c4e1b0 100644 --- a/koschei/views.py +++ b/koschei/views.py @@ -189,16 +189,22 @@ def add_packages(): if request.method == 'POST': be = create_backend() names = request.form['names'].split() - try: - added = be.add_packages(names) - log.info("{user} added\n{what}".format(user=g.user.name, - what=' '.join(x.name for x in added))) - except backend.PackagesDontExist as e: - flash("Packages don't exist: " + ','.join(e.names)) - return redirect(url_for('add_packages')) - return redirect(url_for('frontpage')) - else: - return render_template("add-packages.html") + if names: + try: + added = be.add_packages(names) + if added: + added = ' '.join(x.name for x in added) + log.info("{user} added\n{added}".format(user=g.user.name, + added=added)) + flash("Packages added: {added}".format(added=added)) + else: + flash("Given packages already present") + db_session.commit() + except backend.PackagesDontExist as e: + flash("Packages don't exist: " + ','.join(e.names)) + return redirect(url_for('add_packages')) + return redirect(url_for('frontpage')) + return render_template("add-packages.html") @app.route('/documentation') @tab('Documentation') diff --git a/templates/add-packages.html b/templates/add-packages.html index 7dfab5e..320e92d 100644 --- a/templates/add-packages.html +++ b/templates/add-packages.html @@ -1,8 +1,8 @@ {% extends "base.html" %} {% block content %}
-
Package names to be added to Koschei:
-
+
Names of packages to be added to Koschei:
+
{% endblock content %}