[copr] master: Allow resubmitting builds by a single button (89bfdee)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 89bfdeeb23d14fe20924faac89042f702345e662
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 13:25:04 2013 +0100
Allow resubmitting builds by a single button
>---------------------------------------------------------------
coprs_frontend/coprs/logic/builds_logic.py | 6 +++++
.../coprs/templates/coprs/detail/_build_forms.html | 8 +++++++
.../templates/coprs/detail/_builds_table.html | 7 +++--
.../coprs/views/coprs_ns/coprs_builds.py | 23 ++++++++++++++++++++
4 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/coprs_frontend/coprs/logic/builds_logic.py b/coprs_frontend/coprs/logic/builds_logic.py
index 41575ee..465db18 100644
--- a/coprs_frontend/coprs/logic/builds_logic.py
+++ b/coprs_frontend/coprs/logic/builds_logic.py
@@ -1,3 +1,5 @@
+import time
+
from coprs import db
from coprs import exceptions
from coprs import models
@@ -57,6 +59,10 @@ class BuildsLogic(object):
if check_authorized:
if not user.can_build_in(copr):
raise exceptions.InsufficientRightsException('User {0} cannot build in copr {1}/{2}'.format(user.name, copr.owner.name, copr.name))
+ if not build.submitted_on:
+ build.submitted_on = int(time.time())
+ if not build.user:
+ build.user = user
coprs_logic.CoprsLogic.increment_build_count(user, copr)
db.session.add(build)
diff --git a/coprs_frontend/coprs/templates/coprs/detail/_build_forms.html b/coprs_frontend/coprs/templates/coprs/detail/_build_forms.html
index c01dd20..edc6964 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/_build_forms.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/_build_forms.html
@@ -24,3 +24,11 @@
</form>
{% endif %}
{% endmacro %}
+
+{% macro copr_build_repeat_form(build) %}
+ {% if build.cancelable %}
+ <form action="{{ url_for('coprs_ns.copr_repeat_build', username=build.copr.owner.name, coprname=build.copr.name, build_id=build.id)}}" method="post">
+ <input type="submit" value="Repeat">
+ </form>
+ {% endif %}
+{% endmacro %}
diff --git a/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html b/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
index b2fa2b9..dfaf9de 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
@@ -1,4 +1,4 @@
-{% from "coprs/detail/_build_forms.html" import copr_build_cancel_form %}
+{% from "coprs/detail/_build_forms.html" import copr_build_cancel_form, copr_build_repeat_form %}
{% macro builds_table(builds) %}
{% if builds %}
@@ -25,8 +25,9 @@
<td>
{% if g.user and g.user == build.user %}
{{ copr_build_cancel_form(build) }}
- {% else %}
- ---
+ {% endif %}
+ {% if g.user and g.user.can_build_in(copr) %}
+ {{ copr_build_repeat_form(build) }}
{% endif %}
</td>
</tr>
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
index 805a9db..1e28499 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
@@ -85,3 +85,26 @@ def copr_cancel_build(username, coprname, build_id):
flask.flash('Build was canceled')
return flask.redirect(flask.url_for('coprs_ns.copr_detail', username = username, coprname = coprname))
+
+(a)coprs_ns.route('/detail/<username>/<coprname>/repeat_build/<int:build_id>/', methods = ['POST'])
+@login_required
+def copr_repeat_build(username, coprname, build_id):
+ build = builds_logic.BuildsLogic.get(flask.g.user, build_id).first()
+ copr = coprs_logic.CoprsLogic.get(flask.g.user, username=username, coprname=coprname).first()
+
+ if not build: # hey, this Build doesn't exist
+ return page_not_found('Build with id {0} does not exist.'.format(build_id))
+
+ if not copr: # hey, this Copr doesn't exist
+ return page_not_found('Copr {0}/{1} does not exist.'.format(username, coprname))
+
+ # TODO: do intersection of chroots with currently active?
+ new_build = models.Build()
+ for a in ['pkgs', 'chroots', 'repos', 'memory_reqs', 'timeout']:
+ setattr(new_build, a, getattr(build, a))
+ builds_logic.BuildsLogic.new(flask.g.user, new_build, copr)
+
+ db.session.commit()
+ flask.flash('Build was resubmitted')
+
+ return flask.redirect(flask.url_for('coprs_ns.copr_builds', username = username, coprname = coprname))
11 years, 3 months
[copr] master: A little space for flash messages (6c6b1e5)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 6c6b1e50b61a6bc7de1c06f75256cb4ccd48ff90
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 13:23:53 2013 +0100
A little space for flash messages
>---------------------------------------------------------------
coprs_frontend/coprs/static/style-new.css | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/style-new.css
index 6021d19..8265cff 100644
--- a/coprs_frontend/coprs/static/style-new.css
+++ b/coprs_frontend/coprs/static/style-new.css
@@ -39,6 +39,7 @@ div.flash {
font-size: 1.2em;
text-align: center;
padding: 0.5em;
+ margin-bottom: 1em;
border-radius: 5px;
-moz-border-radius: 5px;
11 years, 3 months
[copr] master: Some quotes for build cancel form (6e9d48b)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 6e9d48bf5e43e1ac298b410f960a0b475acaff3d
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 12:59:44 2013 +0100
Some quotes for build cancel form
>---------------------------------------------------------------
.../coprs/templates/coprs/detail/_build_forms.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/coprs_frontend/coprs/templates/coprs/detail/_build_forms.html b/coprs_frontend/coprs/templates/coprs/detail/_build_forms.html
index f5a761e..c01dd20 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/_build_forms.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/_build_forms.html
@@ -19,8 +19,8 @@
{% macro copr_build_cancel_form(build) %}
{% if build.cancelable %}
- <form action="{{ url_for('coprs_ns.copr_cancel_build', username = build.copr.owner.name, coprname = build.copr.name, build_id = build.id)}}" method=post>
- <input type=submit value=Cancel>
+ <form action="{{ url_for('coprs_ns.copr_cancel_build', username=build.copr.owner.name, coprname=build.copr.name, build_id=build.id)}}" method="post">
+ <input type="submit" value="Cancel">
</form>
{% endif %}
{% endmacro %}
11 years, 3 months
[copr] master: Some quotes for copr permission form (3818e8a)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 3818e8ac2d2ea82674dd83d4d97e29ef8f7df7ea
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 12:57:01 2013 +0100
Some quotes for copr permission form
>---------------------------------------------------------------
.../coprs/templates/coprs/_coprs_forms.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/coprs_frontend/coprs/templates/coprs/_coprs_forms.html b/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
index 61bae4f..8c7daa7 100644
--- a/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
+++ b/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
@@ -31,9 +31,9 @@
{% macro copr_permissions_form(form, copr, permissions) %}
{% if permissions %}
- <form action="{{ url_for('coprs_ns.copr_update_permissions', username = copr.owner.name, coprname = copr.name) }}" method=post>
+ <form action="{{ url_for('coprs_ns.copr_update_permissions', username=copr.owner.name, coprname=copr.name) }}" method=post>
{{ form.csrf_token }}
- <table class=permissions-table>
+ <table class="permissions-table">
<tr><th>Username</th><th>Is Builder</th><th>Is Admin</th></tr>
{% for perm in permissions %}
<tr>
@@ -53,7 +53,7 @@
</tr>
{% endfor %}
</table>
- <dd><input type=submit value=Save></dd>
+ <dd><input type="submit" value="Save"></dd>
</form>
{% endif %}
{% endmacro %}
11 years, 3 months
[copr] master: Make the chroots set tables display side by side (7b7b20c)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 7b7b20c6f9391400e5299741c2afbd3a73bc81bf
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 12:48:30 2013 +0100
Make the chroots set tables display side by side
>---------------------------------------------------------------
coprs_frontend/coprs/static/style-new.css | 4 ++++
.../coprs/templates/coprs/_coprs_forms.html | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/style-new.css
index 629b84e..6021d19 100644
--- a/coprs_frontend/coprs/static/style-new.css
+++ b/coprs_frontend/coprs/static/style-new.css
@@ -227,6 +227,10 @@ table.releases {
border-collapse:collapse;
}
+table.chroots-set {
+ display: inline;
+}
+
table.builds-table {
width: 100%;
}
diff --git a/coprs_frontend/coprs/templates/coprs/_coprs_forms.html b/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
index a7b11ec..61bae4f 100644
--- a/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
+++ b/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
@@ -12,7 +12,7 @@
<p class="form-error">{{ form._mock_chroots_error }}</p>
{% endif %}
{% for group_set, chs in form.chroots_sets.items() %}
- <table>
+ <table class="chroots-set">
{% for ch in chs %}
<tr>
<td>{{ form|attr(ch)|attr('label') }}</td><td>{{ form|attr(ch) }}</td>
11 years, 3 months
[copr] master: Only display 10 builds per page (6c807db)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 6c807db1b4c86f1c05465025c736056dc9a5004e
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 12:40:27 2013 +0100
Only display 10 builds per page
>---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_builds.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
index 7756e6f..805a9db 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
@@ -25,7 +25,7 @@ def copr_builds(username, coprname, page=1):
builds_query = builds_logic.BuildsLogic.get_multiple(flask.g.user, copr=copr)
- paginator = helpers.Paginator(builds_query, copr.build_count, page, per_page_override = 20)
+ paginator = helpers.Paginator(builds_query, copr.build_count, page, per_page_override = 10)
return flask.render_template('coprs/detail/builds.html', copr=copr, builds=paginator.sliced_query, paginator=paginator)
11 years, 3 months
[copr] master: Some styling for pagination (dd46dc9)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit dd46dc9e49c083d8ff88671e00a7d9be1d2853e0
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 12:40:12 2013 +0100
Some styling for pagination
>---------------------------------------------------------------
coprs_frontend/coprs/static/style-new.css | 7 +++++++
coprs_frontend/coprs/templates/_helpers.html | 6 +++++-
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/style-new.css
index 5297d18..629b84e 100644
--- a/coprs_frontend/coprs/static/style-new.css
+++ b/coprs_frontend/coprs/static/style-new.css
@@ -45,6 +45,13 @@ div.flash {
-webkit-border-radius: 5px;
}
+div.pagination {
+ width: 100%;
+ text-align: center;
+ font-size: 1.3em;
+ margin: 1em;
+}
+
div.login, div.login a {
color: white;
font-weight: bold;
diff --git a/coprs_frontend/coprs/templates/_helpers.html b/coprs_frontend/coprs/templates/_helpers.html
index 38d3aa4..487a5dc 100644
--- a/coprs_frontend/coprs/templates/_helpers.html
+++ b/coprs_frontend/coprs/templates/_helpers.html
@@ -20,7 +20,11 @@
<a href="{{ paginator.border_url(request, True)[0] }}">{{ paginator.border_url(request, True)[1] }}</a> ...
{% endif %}
{% for page in paginator.get_urls(request) %}
- <a href="{{ page[0] }}">{{ page[1] }}</a>
+ {% if page[1] != paginator.page %} {# no url for current page #}
+ <a href="{{ page[0] }}">{{ page[1] }}</a>
+ {% else %}
+ {{ page[1] }}
+ {% endif %}
{% endfor %}
{% if paginator.border_url(request, False) %}
... <a href="{{ paginator.border_url(request, False)[0] }}">{{ paginator.border_url(request, False)[1] }}</a>
11 years, 3 months
[copr] master: Commit forgotten add_build template (0190651)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 019065127ed6ccb24fba16e52c08128dffc166a2
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 12:16:05 2013 +0100
Commit forgotten add_build template
>---------------------------------------------------------------
.../coprs/templates/coprs/detail/add_build.html | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/coprs_frontend/coprs/templates/coprs/detail/add_build.html b/coprs_frontend/coprs/templates/coprs/detail/add_build.html
new file mode 100644
index 0000000..e7e8713
--- /dev/null
+++ b/coprs_frontend/coprs/templates/coprs/detail/add_build.html
@@ -0,0 +1,10 @@
+{% extends "coprs/detail.html" %}
+{% block title %}Adding Build for {{ copr.owner.name }}/{{ copr.name }}{% endblock %}
+{% block new_build_selected %}selected{% endblock %}
+{% from "coprs/detail/_build_forms.html" import copr_build_form with context %}
+
+{% block detail_body %}
+
+ {{ copr_build_form(form, 'coprs_ns.copr_new_build', copr) }}
+
+{% endblock %}
11 years, 3 months
[copr] master: Fix the rest of the tests failing after the UI remake (23a9df8)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 23a9df82689bafb10af6231ec2ae636ca19b6025
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 12:11:56 2013 +0100
Fix the rest of the tests failing after the UI remake
>---------------------------------------------------------------
.../tests/test_views/test_coprs_ns/test_general.py | 50 +++++++++++---------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/coprs_frontend/tests/test_views/test_coprs_ns/test_general.py b/coprs_frontend/tests/test_views/test_coprs_ns/test_general.py
index c5bf51d..16a39f2 100644
--- a/coprs_frontend/tests/test_views/test_coprs_ns/test_general.py
+++ b/coprs_frontend/tests/test_views/test_coprs_ns/test_general.py
@@ -4,11 +4,11 @@ from tests.coprs_test_case import CoprsTestCase
class TestCoprsShow(CoprsTestCase):
def test_show_no_entries(self):
- assert 'No entries' in self.tc.get('/').data
+ assert 'No coprs...' in self.tc.get('/').data
def test_show_more_entries(self, f_users, f_coprs):
r = self.tc.get('/')
- assert r.data.count('<div class=copr>') == 3
+ assert r.data.count('<div class="copr">') == 3
class TestCoprsOwned(CoprsTestCase):
def test_owned_none(self, f_users, f_coprs):
@@ -18,7 +18,7 @@ class TestCoprsOwned(CoprsTestCase):
self.db.session.add(self.u3)
r = c.get('/coprs/owned/{0}/'.format(self.u3.name))
- assert 'No entries' in r.data
+ assert 'No coprs...' in r.data
def test_owned_one(self, f_users, f_coprs):
with self.tc as c:
@@ -27,7 +27,7 @@ class TestCoprsOwned(CoprsTestCase):
self.db.session.add(self.u1)
r = c.get('/coprs/owned/{0}/'.format(self.u1.name))
- assert r.data.count('<div class=copr>') == 1
+ assert r.data.count('<div class="copr">') == 1
class TestCoprsAllowed(CoprsTestCase):
def test_allowed_none(self, f_users, f_coprs, f_copr_permissions):
@@ -37,7 +37,7 @@ class TestCoprsAllowed(CoprsTestCase):
self.db.session.add(self.u3)
r = c.get('/coprs/allowed/{0}/'.format(self.u3.name))
- assert 'No entries' in r.data
+ assert 'No coprs...' in r.data
def test_allowed_one(self, f_users, f_coprs, f_copr_permissions):
with self.tc as c:
@@ -46,7 +46,7 @@ class TestCoprsAllowed(CoprsTestCase):
self.db.session.add(self.u1)
r = c.get('/coprs/allowed/{0}/'.format(self.u1.name))
- assert r.data.count('<div class=copr>') == 1
+ assert r.data.count('<div class="copr">') == 1
def test_allowed_one_but_asked_for_one_more(self, f_users, f_coprs, f_copr_permissions):
with self.tc as c:
@@ -55,7 +55,7 @@ class TestCoprsAllowed(CoprsTestCase):
self.db.session.add(self.u1)
r = c.get('/coprs/allowed/{0}/'.format(self.u1.name))
- assert r.data.count('<div class=copr>') == 1
+ assert r.data.count('<div class="copr">') == 1
class TestCoprNew(CoprsTestCase):
success_string = 'New copr was successfully created'
@@ -126,16 +126,18 @@ class TestCoprDetail(CoprsTestCase):
assert self.c1.name in r.data
def test_copr_detail_contains_builds(self, f_users, f_coprs, f_builds):
- r = self.tc.get('/coprs/detail/{0}/{1}/'.format(self.u1.name, self.c1.name))
- assert r.data.count('<tr class=build') == 2
+ r = self.tc.get('/coprs/detail/{0}/{1}/builds/'.format(self.u1.name, self.c1.name))
+ print r.data
+ assert r.data.count('<tr class="build') == 2
def test_copr_detail_anonymous_doesnt_contain_permissions_table_when_no_permissions(self, f_users, f_coprs, f_copr_permissions):
- r = self.tc.get('/coprs/detail/{0}/{1}/'.format(self.u1.name, self.c1.name))
- assert '<table class=permissions' not in r.data
+ r = self.tc.get('/coprs/detail/{0}/{1}/permissions/'.format(self.u1.name, self.c1.name))
+ assert '<table class="permissions"' not in r.data
def test_copr_detail_contains_permissions_table(self, f_users, f_coprs, f_copr_permissions):
- r = self.tc.get('/coprs/detail/{0}/{1}/'.format(self.u2.name, self.c3.name))
- assert '<table class=permissions' in r.data
+ r = self.tc.get('/coprs/detail/{0}/{1}/permissions/'.format(self.u2.name, self.c3.name))
+ print r.data
+ assert '<table class="permissions-table"' in r.data
assert '<td>{0}'.format(self.u3.name) in r.data
assert '<td>{0}'.format(self.u1.name) in r.data
@@ -149,7 +151,7 @@ class TestCoprDetail(CoprsTestCase):
s['openid'] = self.u1.openid_name
self.db.session.add_all([self.u2, self.c2])
- r = c.get('/coprs/detail/{0}/{1}/'.format(self.u2.name, self.c2.name))
+ r = c.get('/coprs/detail/{0}/{1}/permissions/'.format(self.u2.name, self.c2.name))
# u1 is approved builder, check for that
assert '/permissions_applier_change/' in r.data
@@ -159,7 +161,7 @@ class TestCoprDetail(CoprsTestCase):
s['openid'] = self.u2.openid_name
self.db.session.add_all([self.u2, self.c2])
- r = c.get('/coprs/detail/{0}/{1}/'.format(self.u2.name, self.c2.name))
+ r = c.get('/coprs/detail/{0}/{1}/permissions/'.format(self.u2.name, self.c2.name))
assert '/permissions_applier_change/' not in r.data
def test_detail_has_correct_permissions_form(self, f_users, f_coprs, f_copr_permissions):
@@ -168,7 +170,7 @@ class TestCoprDetail(CoprsTestCase):
s['openid'] = self.u2.openid_name
self.db.session.add_all([self.u2, self.c3])
- r = c.get('/coprs/detail/{0}/{1}/'.format(self.u2.name, self.c3.name))
+ r = c.get('/coprs/detail/{0}/{1}/permissions/'.format(self.u2.name, self.c3.name))
assert r.data.count('nothing') == 2
assert '<select id="copr_builder_1" name="copr_builder_1">' in r.data
@@ -184,7 +186,7 @@ class TestCoprDetail(CoprsTestCase):
s['openid'] = self.u1.openid_name
self.db.session.add_all([self.u2, self.c2])
- r = c.get('/coprs/detail/{0}/{1}/'.format(self.u2.name, self.c2.name))
+ r = c.get('/coprs/detail/{0}/{1}/builds/'.format(self.u2.name, self.c2.name))
assert '/cancel_build/' not in r.data
def test_copr_detail_allows_submitter_to_cancel_build(self, f_users, f_coprs, f_builds):
@@ -193,7 +195,7 @@ class TestCoprDetail(CoprsTestCase):
s['openid'] = self.u2.openid_name
self.db.session.add_all([self.u2, self.c2])
- r = c.get('/coprs/detail/{0}/{1}/'.format(self.u2.name, self.c2.name))
+ r = c.get('/coprs/detail/{0}/{1}/builds/'.format(self.u2.name, self.c2.name))
assert '/cancel_build/' in r.data
@@ -243,11 +245,15 @@ class TestCoprUpdate(CoprsTestCase):
r = c.post('/coprs/detail/{0}/{1}/update/'.format(self.u1.name, self.c1.name),
data = {'name': self.c1.name, self.mc2.chroot_name: 'y', self.mc3.chroot_name: 'y', 'id': self.c1.id},
follow_redirects = True)
- self.db.session.add_all([self.mc1, self.mc2, self.mc3])
assert 'Copr was updated successfully' in r.data
- assert self.mc2.chroot_name in r.data
- assert self.mc3.chroot_name in r.data
- assert self.mc1.chroot_name not in r.data
+ self.db.session.add_all([self.c1, self.mc1, self.mc2, self.mc3])
+ mock_chroots = self.models.MockChroot.query.join(self.models.CoprChroot).\
+ filter(self.models.CoprChroot.copr_id==\
+ self.c1.id).all()
+ mock_chroots_names = map(lambda x: x.chroot_name, mock_chroots)
+ assert self.mc2.chroot_name in mock_chroots_names
+ assert self.mc3.chroot_name in mock_chroots_names
+ assert self.mc1.chroot_name not in mock_chroots_names
class TestCoprApplyForPermissions(CoprsTestCase):
11 years, 3 months
[copr] master: Some cosmetic changes to permissions table (6cb0f54)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 6cb0f5435fa6f664c900b731f5a7d9c42aa3fb7c
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 11:52:59 2013 +0100
Some cosmetic changes to permissions table
>---------------------------------------------------------------
.../templates/coprs/detail/_permissions_table.html | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/coprs_frontend/coprs/templates/coprs/detail/_permissions_table.html b/coprs_frontend/coprs/templates/coprs/detail/_permissions_table.html
index a8675ec..d8ded5d 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/_permissions_table.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/_permissions_table.html
@@ -1,14 +1,14 @@
{% macro permissions_table(permissions, current_user_permissions, copr, permissions_applier_form, permissions_form) %}
{% if permissions or g.user != copr.owner %} {# display the whole table if there are permissions or user can ask for them #}
{% if permissions_applier_form and g.user %}
- <form action="{{ url_for('coprs_ns.copr_permissions_applier_change', username = copr.owner.name, coprname = copr.name)}}" method=post>
+ <form action="{{ url_for('coprs_ns.copr_permissions_applier_change', username=copr.owner.name, coprname=copr.name)}}" method=post>
{{ permissions_applier_form.csrf_token }}
{% endif %}
{% if permissions_form and g.user %}
- <form action="{{ url_for('coprs_ns.copr_update_permissions', username = copr.owner.name, coprname = copr.name)}}" method=post>
+ <form action="{{ url_for('coprs_ns.copr_update_permissions', username=copr.owner.name, coprname=copr.name)}}" method=post>
{{ permissions_form.csrf_token }}
{% endif %}
- <table class=permissions-table>
+ <table class="permissions-table">
<tr><th>Username</th><th>Is Builder</th><th>Is Admin</th></tr>
{% for perm in permissions %}
{% if perm.user_id != g.user.id %} {# if user is logged in, only display his form below, not a row #}
@@ -18,7 +18,7 @@
{{ permissions_table_row_current_user(current_user_permissions, permissions_applier_form, permissions_form) }}
</table>
{% if g.user and (permissions_applier_form or permissions_form) %} {# TODO: when to display? #}
- <input type=submit value=Submit>
+ <input type="submit" value="Update">
</form>
{% endif %}
{% else %}
11 years, 3 months