Merge lp:~arthur-she/lava-scheduler/fix-for-bug-1172724 into lp:lava-scheduler

[Arthur She]

Let the logged-in user who is the member of builds / baselines group has the permission to cancel/re-submit/annotate the jobs which were submitted by 'ciadmin'.

[Arthur She (arthur-she)]

Let the logged-in user who is the member of builds / baselines group can manipulate (cancel / re-submit / annotate) the jobs which were submitted by 'ciadmin'

[Senthil Kumaran S (stylesen)]

Your fixes should be 80 column aligned. Please make sure the line you are editing is 80 column aligned and re-submit the patch.

review: Needs Fixing

[Senthil Kumaran S (stylesen)]

+1 for this change.

review: Approve

[Antonio Terceiro (terceiro)]

I realize this has already been merged, but I need to comment. :-)

> === modified file 'lava_scheduler_app/models.py'
> --- lava_scheduler_app/models.py 2013-02-10 21:26:06 +0000
> +++ lava_scheduler_app/models.py 2013-06-24 09:24:26 +0000
> @@ -477,7 +477,10 @@
> """ used to check for things like if the user can cancel or annotate
> a job failure
> """
> - return user.is_superuser or user == self.submitter
> + ci_admin_groups = ['builds', 'baselines']
> + return (user.is_superuser or user == self.submitter or
> + ('ciadmin' == self.submitter.username and
> + user.groups.filter(name__in=ci_admin_groups).exists()))

Maybe we could instead add an attribute to groups that says whether a
group can manage jobs and then check for that being True here, instead
of hardcoding group names in the code like this.

--
Antonio Terceiro
Software Engineer - Linaro
http://www.linaro.org

Unmerged revisions

250. By Arthur She on 2013-06-24

fix bug #1172724.
Make the code 80 columns aligned.

modified:
  lava_scheduler_app/models.py

249. By Arthur She on 2013-06-24

fix bug #1172724.
Make the code 80 columns aligned

modified:
  lava_scheduler_app/models.py

248. By Arthur She on 2013-06-24

fix for bux #1172724

modified:
  lava_scheduler_app/models.py

=== modified file 'lava_scheduler_app/models.py'
--- lava_scheduler_app/models.py	2013-02-10 21:26:06 +0000
+++ lava_scheduler_app/models.py	2013-06-24 09:24:26 +0000
@@ -477,7 +477,10 @@
         """ used to check for things like if the user can cancel or annotate
         a job failure
         """
-        return user.is_superuser or user == self.submitter
+        ci_admin_groups = ['builds', 'baselines']
+        return (user.is_superuser or user == self.submitter or
+               ('ciadmin' == self.submitter.username and
+               user.groups.filter(name__in=ci_admin_groups).exists()))
 
     def can_annotate(self, user):
         """