[Erp5-report] r34564 luke - /erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py

[nobody at svn.erp5.org]

Author: luke
Date: Wed Apr 14 18:03:06 2010
New Revision: 34564

URL: http://svn.erp5.org?rev=34564&view=rev
Log:
 - differentiate configurator and witch

Modified:
    erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py

Modified: erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py?rev=34564&r1=34563&r2=34564&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py [utf8] (original)
+++ erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py [utf8] Wed Apr 14 18:03:06 2010
@@ -294,25 +294,26 @@
       # add special user
       try:
         self.connection.acl_users.zodb_users.manage_addUser(
-          self.partition_dict['WITCH_LOGIN'],'',
-          self.partition_dict['WITCH_PASSWORD'],
-          self.partition_dict['WITCH_PASSWORD'],
+          self.partition_dict['CONFIGURATOR_LOGIN'],'',
+          self.partition_dict['CONFIGURATOR_PASSWORD'],
+          self.partition_dict['CONFIGURATOR_PASSWORD'],
           None)
       except xmlrpclib.Fault, e:
         if 'Duplicate user ID' not in e.faultString:
           return 'reportError', 'xmlrpclib.Fault: %s' % e.faultString
       # missing possiblity to do:
       #  self.connection.zodb_roles.doAssignRoleToPrincipal(
-      #    self.partition_dict['WITCH_LOGIN'], 'Member')
+      #    self.partition_dict['CONFIGURATOR_LOGIN'], 'Member')
       self.connection.portal_wizard.manage_addLocalRoles(
-          self.partition_dict['WITCH_LOGIN'],
-          ('Manager',),None)
+          self.partition_dict['CONFIGURATOR_LOGIN'],
+          ('Manager',), None)
       # preferences
       default_site_preference = self.connection.portal_preferences\
           .default_site_preference
       default_site_preference.setPreferredWitchToolServerUrl(
           self.partition_dict['WITCH_SERVER_URL'])
-      default_site_preference.setPreferredWitchToolServerRoot('')
+      default_site_preference.setPreferredWitchToolServerRoot(
+          self.partition_dict['WITCH_SERVER_ROOT'])
       default_site_preference.setPreferredExpressSubscriptionStatus('1')
       default_site_preference.setPreferredExpressErp5Uid(
           self.partition_dict['ID'])
@@ -327,6 +328,10 @@
         self.partition_dict['WITCH_LOGIN'])
       customer_preference.setPreferredExpressPassword(
         self.partition_dict['WITCH_PASSWORD'])
+      customer_preference.manage_delLocalRoles(
+          [self.partition_dict['INSTANCE_ADMIN_USER']], None)
+      customer_preference.manage_addLocalRoles(self.partition_dict[
+        'CONFIGURATOR_LOGIN'], ('Owner',), None)
       if customer_preference.getPreferenceState() == 'disabled':
         customer_preference.enable()
       return 'reportInstalled', 'Ready for configuration'