From: <ke...@us...> - 2006-05-21 19:51:06
|
Revision: 3010 Author: kevca Date: 2006-05-21 12:50:55 -0700 (Sun, 21 May 2006) ViewCVS: http://svn.sourceforge.net/mailmanager/?rev=3010&view=rev Log Message: ----------- Fix for - Incorrect abilities for new accounts (#1492592) Modified Paths: -------------- MailManager/branches/RELENG_2_1/MailManager.py MailManager/branches/RELENG_2_1/migrations/v2_1/__init__.py MailManager/branches/RELENG_2_1/sql/v2_1/deleteUserAbility.zsql Modified: MailManager/branches/RELENG_2_1/MailManager.py =================================================================== --- MailManager/branches/RELENG_2_1/MailManager.py 2006-05-21 13:36:59 UTC (rev 3009) +++ MailManager/branches/RELENG_2_1/MailManager.py 2006-05-21 19:50:55 UTC (rev 3010) @@ -2160,7 +2160,7 @@ elif self.sql.listUsers(sqv_username=username) and REQUEST['section'] == 'add': error = 'Duplicate username.' flag = 'username' - + # Usernames must not contain unicode characters (see bug #1478348) try: blank = unicode(username, 'utf-8').encode('ascii') @@ -2256,13 +2256,6 @@ sqv_ability = ability ) - # Add on the empty ability to allow searching to work ok - self.sql.addUserAbility( - sqv_catno = 0, - sqv_username = username, - sqv_ability = '' - ) - if abilities1: if type(abilities1) is not list: abilities1 = [abilities1] @@ -2280,13 +2273,6 @@ sqv_ability = ability ) - # Add on the empty ability to allow searching to work ok - self.sql.addUserAbility( - sqv_catno = 1, - sqv_username = username, - sqv_ability = '' - ) - if abilities2: if type(abilities2) is not list: abilities2 = [abilities2] @@ -2304,15 +2290,23 @@ sqv_ability = ability ) - # Add on the empty ability to allow searching to work ok + # Ensure that an empty ability exists for all categories + for catno in [0,1,2]: + self.sql.deleteUserAbility( + sqv_catno = catno, + sqv_username = username, + sqv_ability = '' + ) + self.sql.addUserAbility( - sqv_catno = 2, + sqv_catno = catno, sqv_username = username, sqv_ability = '' ) + security.declareProtected('MailManager Settings', 'http_delUserForm') def http_delUserForm(self, username, REQUEST): """Display the Delete User form.""" Modified: MailManager/branches/RELENG_2_1/migrations/v2_1/__init__.py =================================================================== --- MailManager/branches/RELENG_2_1/migrations/v2_1/__init__.py 2006-05-21 13:36:59 UTC (rev 3009) +++ MailManager/branches/RELENG_2_1/migrations/v2_1/__init__.py 2006-05-21 19:50:55 UTC (rev 3010) @@ -77,6 +77,34 @@ # Update the mversion to show we are complete self.mversion = 'v2_1_3' +def migrate_v2_1_3_v2_1_4(self, migrationParams): + """ Fix missing user abilities for any migrated users + + Late divergence fix for users coming from 2.0. + User abilities + """ + + for user in self.sql.listUsers(): + username = user.username + + # Ensure that an empty ability exists for all categories + for catno in [0,1,2]: + self.sql.deleteUserAbility( + sqv_catno = catno, + sqv_username = username, + sqv_ability = '' + ) + + self.sql.addUserAbility( + sqv_catno = catno, + sqv_username = username, + sqv_ability = '' + ) + + # Update the mversion to show we are complete + self.mversion = 'v2_1_4' + + def migrate_convert_postgres_unicode(self, migrationParams): """ Convert postgres database to using unicode """ Modified: MailManager/branches/RELENG_2_1/sql/v2_1/deleteUserAbility.zsql =================================================================== --- MailManager/branches/RELENG_2_1/sql/v2_1/deleteUserAbility.zsql 2006-05-21 13:36:59 UTC (rev 3009) +++ MailManager/branches/RELENG_2_1/sql/v2_1/deleteUserAbility.zsql 2006-05-21 19:50:55 UTC (rev 3010) @@ -9,5 +9,5 @@ <dtml-sqlgroup where> <dtml-sqltest sqv_username column="username" type="nb" optional> <dtml-and> - <dtml-sqltest sqv_ability column="username" type="nb" optional> + <dtml-sqltest sqv_ability column="ability" type="nb" optional> </dtml-sqlgroup> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |