Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
commit 34c3ddbef629a222e49bd3827b008140abff9ccf Author: Miroslav Suchý msuchy@redhat.com Date: Thu Oct 1 10:45:23 2015 +0200
add button "Add Group"
frontend/coprs_frontend/coprs/__init__.py | 1 + .../coprs/templates/coprs/add_group.html | 32 ++++++++++++++++++++ .../coprs_frontend/coprs/templates/coprs/show.html | 7 ++++ .../coprs/views/coprs_ns/coprs_groups.py | 13 ++++++++ 4 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/__init__.py b/frontend/coprs_frontend/coprs/__init__.py index 6d06f34..4bf9cd5 100644 --- a/frontend/coprs_frontend/coprs/__init__.py +++ b/frontend/coprs_frontend/coprs/__init__.py @@ -52,6 +52,7 @@ from coprs.views import coprs_ns from coprs.views.coprs_ns import coprs_builds from coprs.views.coprs_ns import coprs_general from coprs.views.coprs_ns import coprs_chroots +from coprs.views.coprs_ns import coprs_groups from coprs.views import backend_ns from coprs.views.backend_ns import backend_general from coprs.views import misc diff --git a/frontend/coprs_frontend/coprs/templates/coprs/add_group.html b/frontend/coprs_frontend/coprs/templates/coprs/add_group.html new file mode 100644 index 0000000..a86c400 --- /dev/null +++ b/frontend/coprs_frontend/coprs/templates/coprs/add_group.html @@ -0,0 +1,32 @@ +{% extends "layout.html" %} +{% block title %}Add a Group{% endblock %} +{% block header %}Add a Group{% endblock %} + +{% block breadcrumbs %} +<ol class="breadcrumb"> + <li> + <a href="{{ url_for('coprs_ns.coprs_show') }}">Home</a> + </li> + <li> + <a href="{{ url_for('coprs_ns.coprs_by_owner', username=g.user.name) }}">{{ g.user.name }}</a> + </li> + <li class="active"> + Add Group + </li> +</ol> +{% endblock %} +{% block body %} + + <h1>Add a New Group</h1> + +<p> + {% for team in teams %} + <div> + {{ team }} + </div> + {% else %} + <h2>You are not listed in any FAS group.</h2> + {% endfor %} +</p> + +{% endblock %} diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show.html b/frontend/coprs_frontend/coprs/templates/coprs/show.html index 4649d6f..d871d51 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/show.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/show.html @@ -107,6 +107,13 @@ {% endfor %} </div> </div> + <div class="panel panel-default"> + <div class="panel-body"> + <a href="{{url_for('coprs_ns.group_add', username=g.user.name) }}"> + <span class="pficon pficon-add-circle-o"> Add Group </span> + </a> + </div> + </div> </div> </div> {% endblock %} diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_groups.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_groups.py new file mode 100644 index 0000000..5596786 --- /dev/null +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_groups.py @@ -0,0 +1,13 @@ +import flask +from coprs.logic.users_logic import UsersLogic +from coprs.views.misc import login_required +from coprs.views.coprs_ns import coprs_ns + +@coprs_ns.route("/group/add/") +@login_required +def group_add(): + teams = flask.session.get("teams") + copr_groups = {fas_group : UsersLogic.get_group_by_fas_name(fas_group) for fas_group in teams} + return flask.render_template("coprs/add_group.html", + username=flask.g.user.name, + teams=teams, copr_groups=copr_groups)
copr-commits@lists.fedorahosted.org