[copr] bkabrda-workspace: approved -> copr_builder (8a2bb64)
bkabrda at fedoraproject.org
bkabrda at fedoraproject.org
Mon Nov 26 07:28:33 UTC 2012
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : bkabrda-workspace
>---------------------------------------------------------------
commit 8a2bb645c5aef9eb66157f887b408a6b2ecbaf03
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date: Mon Nov 26 08:22:53 2012 +0100
approved -> copr_builder
>---------------------------------------------------------------
wsgi/coprs/forms.py | 2 +-
wsgi/coprs/logic/coprs_logic.py | 2 +-
wsgi/coprs/models.py | 2 +-
wsgi/coprs/templates/coprs/_permissions_table.html | 2 +-
wsgi/coprs/views/coprs_ns/coprs_general.py | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/wsgi/coprs/forms.py b/wsgi/coprs/forms.py
index 3d71c72..4d061b9 100644
--- a/wsgi/coprs/forms.py
+++ b/wsgi/coprs/forms.py
@@ -110,6 +110,6 @@ class DynamicPermissionsFormFactory(object):
pass
for perm in permissions:
- setattr(F, 'user_{0}'.format(perm.user.id), wtf.BooleanField(default = perm.approved))
+ setattr(F, 'user_{0}'.format(perm.user.id), wtf.BooleanField(default = perm.copr_builder))
return F
diff --git a/wsgi/coprs/logic/coprs_logic.py b/wsgi/coprs/logic/coprs_logic.py
index f378de8..1d57372 100644
--- a/wsgi/coprs/logic/coprs_logic.py
+++ b/wsgi/coprs/logic/coprs_logic.py
@@ -34,7 +34,7 @@ class CoprsLogic(object):
elif user_relation == 'allowed':
aliased_user = db.aliased(models.User)
query = query.join(models.CoprPermission, models.Copr.copr_permissions).\
- filter(models.CoprPermission.approved == True).\
+ filter(models.CoprPermission.copr_builder == True).\
join(aliased_user, models.CoprPermission.user).\
filter(aliased_user.openid_name == models.User.openidize_name(username))
return query
diff --git a/wsgi/coprs/models.py b/wsgi/coprs/models.py
index e5b8937..8c094f9 100644
--- a/wsgi/coprs/models.py
+++ b/wsgi/coprs/models.py
@@ -70,7 +70,7 @@ class User(db.Model, Serializer):
can_build = False
if copr.owner == self:
can_build = True
- if self.permissions_for_copr(copr) and self.permissions_for_copr(copr).approved == True:
+ if self.permissions_for_copr(copr) and self.permissions_for_copr(copr).copr_builder == True:
can_build = True
return can_build
diff --git a/wsgi/coprs/templates/coprs/_permissions_table.html b/wsgi/coprs/templates/coprs/_permissions_table.html
index 0622f63..dd93e86 100644
--- a/wsgi/coprs/templates/coprs/_permissions_table.html
+++ b/wsgi/coprs/templates/coprs/_permissions_table.html
@@ -3,7 +3,7 @@
<table class=permissions-table>
<tr><th>Username</th><th>Allowed to build</th></tr>
{% for perm in permissions %}
- <tr><td>{{ perm.user.name }}</td><td>{{ perm.approved }}</td></tr>
+ <tr><td>{{ perm.user.name }}</td><td>{{ perm.copr_builder }}</td></tr>
{% endfor %}
</table>
{% endif %}
diff --git a/wsgi/coprs/views/coprs_ns/coprs_general.py b/wsgi/coprs/views/coprs_ns/coprs_general.py
index c22fc6f..34207f7 100644
--- a/wsgi/coprs/views/coprs_ns/coprs_general.py
+++ b/wsgi/coprs/views/coprs_ns/coprs_general.py
@@ -138,7 +138,7 @@ def copr_apply_for_building(username, coprname):
elif permission:
flask.flash('You are already listed in permissions for Copr "{0}".'.format(copr.name))
else:
- perm = models.CoprPermission(user = flask.g.user, copr = copr, approved = False)
+ perm = models.CoprPermission(user = flask.g.user, copr = copr, copr_builder = False)
coprs_logic.CoprsPermissionLogic.new(flask.g.user, perm)
db.session.commit()
flask.flash('You have successfuly applied for building in Copr "{0}".'.format(copr.name))
@@ -183,7 +183,7 @@ def copr_update_permissions(username, coprname):
for perm in permissions:
models.CoprPermission.query.filter(models.CoprPermission.copr_id == copr.id).\
filter(models.CoprPermission.user_id == perm.user_id).\
- update({'approved': permissions_form['user_{0}'.format(perm.user_id)].data})
+ update({'copr_builder': permissions_form['user_{0}'.format(perm.user_id)].data})
db.session.commit()
flask.flash('Copr permissions were updated successfully.')
return flask.redirect(flask.url_for('coprs_ns.copr_detail', username = copr.owner.name, coprname = copr.name))
More information about the copr-devel
mailing list