=== modified file 'lib/lp/translations/model/translationimportqueue.py'
--- lib/lp/translations/model/translationimportqueue.py 2009-11-17 11:05:58 +0000
+++ lib/lp/translations/model/translationimportqueue.py 2009-11-18 11:41:37 +0000
@@ -304,21 +304,20 @@
return False
can_admin = (is_admin_or_rosetta_expert(user) or self.isUbuntuAndIsUserTranslationGroupOwner(user))
- if (new_status == RosettaImportStatus.APPROVED and
- not (self.import_into is not None and can_admin)):
+ if new_status == RosettaImportStatus.APPROVED:
# Only administrators are able to set the APPROVED status, and
# that's only possible if we know where to import it
# (import_into not None).
- return False
- if new_status == RosettaImportStatus.BLOCKED and not can_admin:
+ return can_admin and self.import_into is not None
+ if new_status == RosettaImportStatus.BLOCKED:
# Only administrators are able to set an entry to BLOCKED.
- return False
+ return can_admin
if (new_status in (RosettaImportStatus.FAILED,
- RosettaImportStatus.IMPORTED)
- and not is_admin_or_rosetta_expert(user)):
+ RosettaImportStatus.IMPORTED)):
# Only scripts set these statuses and they report as a rosetta
# expert.
- return False
+ return is_admin_or_rosetta_expert(user)
+ # All other statuses can bset set by all authorized persons.
return self.isUserUploaderOrOwner(user) or can_admin
=== modified file 'lib/lp/ translations/ model/translati onimportqueue. py' translations/ model/translati onimportqueue. py 2009-11-17 11:05:58 +0000 translations/ model/translati onimportqueue. py 2009-11-18 11:41:37 +0000 or_rosetta_ expert( user) or
self.isUbuntuA ndIsUserTransla tionGroupOwner( user)) atus.APPROVED and atus.APPROVED: atus.BLOCKED and not can_admin: atus.BLOCKED: tatus.FAILED, atus.IMPORTED) or_rosetta_ expert( user)): atus.IMPORTED) ): or_rosetta_ expert( user) aderOrOwner( user) or can_admin
--- lib/lp/
+++ lib/lp/
@@ -304,21 +304,20 @@
return False
can_admin = (is_admin_
- if (new_status == RosettaImportSt
- not (self.import_into is not None and can_admin)):
+ if new_status == RosettaImportSt
# Only administrators are able to set the APPROVED status, and
# that's only possible if we know where to import it
# (import_into not None).
- return False
- if new_status == RosettaImportSt
+ return can_admin and self.import_into is not None
+ if new_status == RosettaImportSt
# Only administrators are able to set an entry to BLOCKED.
- return False
+ return can_admin
if (new_status in (RosettaImportS
- RosettaImportSt
- and not is_admin_
+ RosettaImportSt
# Only scripts set these statuses and they report as a rosetta
# expert.
- return False
+ return is_admin_
+ # All other statuses can bset set by all authorized persons.
return self.isUserUplo
def setStatus(self, new_status, user):