[copr] master: Some more unification of class names, updated contribution guidelines for that (a82a8e1)
bkabrda at fedoraproject.org
bkabrda at fedoraproject.org
Thu Jan 24 12:01:35 UTC 2013
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit a82a8e16b9656ccea8f7dcb87bee63fd9392f1b7
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date: Thu Jan 24 13:00:44 2013 +0100
Some more unification of class names, updated contribution guidelines for that
>---------------------------------------------------------------
coprs_frontend/CONTRIBUTION_GUIDELINES | 2 ++
coprs_frontend/coprs/logic/coprs_logic.py | 6 +++---
.../coprs/views/coprs_ns/coprs_general.py | 10 +++++-----
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/coprs_frontend/CONTRIBUTION_GUIDELINES b/coprs_frontend/CONTRIBUTION_GUIDELINES
index 98f24e3..0513e4e 100644
--- a/coprs_frontend/CONTRIBUTION_GUIDELINES
+++ b/coprs_frontend/CONTRIBUTION_GUIDELINES
@@ -1,6 +1,8 @@
This file contains some "should" rules, that are good to follow.
- coprs.logic
+-- The *Logic objects should be named after the primary object that they
+ work with, but pluralized. E.g. CoprChroot->CoprChrootsLogic
-- The methods of *Logic objects should generally be @classmethod.
-- The methods of *Logic objects should accept "user" as a second argument
(after the "cls" argument). This argument should contain object of user
diff --git a/coprs_frontend/coprs/logic/coprs_logic.py b/coprs_frontend/coprs/logic/coprs_logic.py
index 1d44ea2..a862055 100644
--- a/coprs_frontend/coprs/logic/coprs_logic.py
+++ b/coprs_frontend/coprs/logic/coprs_logic.py
@@ -56,7 +56,7 @@ class CoprsLogic(object):
created_on=int(time.time()))
CoprsLogic.new(user, copr,
check_for_duplicates=False) # form validation checks for duplicates
- CoprsChrootLogic.new_from_names(user, copr,
+ CoprChrootsLogic.new_from_names(user, copr,
selected_chroots)
return copr
@@ -84,7 +84,7 @@ class CoprsLogic(object):
models.Copr.query.filter(models.Copr.id == copr.id).\
update({models.Copr.build_count: models.Copr.build_count + 1})
-class CoprsPermissionLogic(object):
+class CoprPermissionsLogic(object):
@classmethod
def get(cls, user, copr, searched_user):
query = models.CoprPermission.query.filter(models.CoprPermission.copr == copr).\
@@ -125,7 +125,7 @@ class CoprsPermissionLogic(object):
def delete(cls, user, copr_permission):
db.session.delete(copr_permission)
-class CoprsChrootLogic(object):
+class CoprChrootsLogic(object):
@classmethod
def mock_chroots_from_names(cls, user, names):
db_chroots = models.MockChroot.query.all()
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index fb63e98..a1acad6 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -102,7 +102,7 @@ def copr_permissions(username, coprname):
if not copr:
return page_not_found('Copr with name {0} does not exist.'.format(coprname))
- permissions = coprs_logic.CoprsPermissionLogic.get_for_copr(flask.g.user, copr).all()
+ permissions = coprs_logic.CoprPermissionsLogic.get_for_copr(flask.g.user, copr).all()
if flask.g.user:
user_perm = flask.g.user.permissions_for_copr(copr)
else:
@@ -158,7 +158,7 @@ def copr_update(username, coprname):
copr.repos = form.repos.data.replace('\n', ' ')
copr.description = form.description.data
copr.instructions = form.instructions.data
- coprs_logic.CoprsChrootLogic.update_from_names(flask.g.user, copr, form.selected_chroots)
+ coprs_logic.CoprChrootsLogic.update_from_names(flask.g.user, copr, form.selected_chroots)
coprs_logic.CoprsLogic.update(flask.g.user, copr, check_for_duplicates = False) # form validation checks for duplicates
db.session.commit()
@@ -172,7 +172,7 @@ def copr_update(username, coprname):
@login_required
def copr_permissions_applier_change(username, coprname):
copr = coprs_logic.CoprsLogic.get(flask.g.user, username, coprname).first()
- permission = coprs_logic.CoprsPermissionLogic.get(flask.g.user, copr, flask.g.user).first()
+ permission = coprs_logic.CoprPermissionsLogic.get(flask.g.user, copr, flask.g.user).first()
applier_permissions_form = forms.PermissionsApplierFormFactory.create_form_cls(permission)()
if not copr:
@@ -183,7 +183,7 @@ def copr_permissions_applier_change(username, coprname):
# we rely on these to be 0 or 1 from form. TODO: abstract from that
new_builder = applier_permissions_form.copr_builder.data
new_admin = applier_permissions_form.copr_admin.data
- coprs_logic.CoprsPermissionLogic.update_permissions_by_applier(flask.g.user, copr, permission, new_builder, new_admin)
+ coprs_logic.CoprPermissionsLogic.update_permissions_by_applier(flask.g.user, copr, permission, new_builder, new_admin)
db.session.commit()
flask.flash('Successfuly updated permissions do Copr "{0}".'.format(copr.name))
@@ -207,7 +207,7 @@ def copr_update_permissions(username, coprname):
for perm in permissions:
new_builder = permissions_form['copr_builder_{0}'.format(perm.user_id)].data
new_admin = permissions_form['copr_admin_{0}'.format(perm.user_id)].data
- coprs_logic.CoprsPermissionLogic.update_permissions(flask.g.user, copr, perm, new_builder, new_admin)
+ coprs_logic.CoprPermissionsLogic.update_permissions(flask.g.user, copr, perm, new_builder, new_admin)
db.session.commit()
flask.flash('Copr permissions were updated successfully.')
More information about the copr-devel
mailing list