[Erp5-report] r38793 fabien - in /experimental/bt5/erp5_credential: PropertySheetTemplateIt...

[nobody at svn.erp5.org]

Author: fabien
Date: Thu Sep 30 13:36:18 2010
New Revision: 38793

URL: http://svn.erp5.org?rev=38793&view=rev
Log:
Remove corporate_name from CredentialRequest property sheet as there is now a special property sheet dedicated to organisation properties storage (CredentialOrganisationProperties)

get organisation_title instead of corporate_name as corporate_name is not a Credential Request porperty anymore. Improve the label

Modified:
    experimental/bt5/erp5_credential/PropertySheetTemplateItem/CredentialRequest.py
    experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.xml
    experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_setDefaultDestinationDecision.xml
    experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_view/my_organisation_title.xml
    experimental/bt5/erp5_credential/bt/revision

Modified: experimental/bt5/erp5_credential/PropertySheetTemplateItem/CredentialRequest.py
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/PropertySheetTemplateItem/CredentialRequest.py?rev=38793&r1=38792&r2=38793&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/PropertySheetTemplateItem/CredentialRequest.py [utf8] (original)
+++ experimental/bt5/erp5_credential/PropertySheetTemplateItem/CredentialRequest.py [utf8] Thu Sep 30 13:36:18 2010
@@ -35,10 +35,5 @@ class CredentialRequest:
     'type'        : 'date',
     'mode'        : 'w',
     },
-    { 'id'          : 'corporate_name',
-      'description' : 'The official name of this organisation',
-      'type'        : 'string',
-      'mode'        : 'w' 
-    },
     )
 

Modified: experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.xml?rev=38793&r1=38792&r2=38793&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.xml [utf8] (original)
+++ experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.xml [utf8] Thu Sep 30 13:36:18 2010
@@ -59,7 +59,7 @@ Auditor -- allow to get credential reque
 if REQUEST is not None:\n
   return None\n
 \n
-if context.getCorporateName():\n
+if context.getOrganisationTitle():\n
   related_portal_type.append(\'Organisation\')\n
 \n
 #Create related object, pass a copy of the dict\n

Modified: experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_setDefaultDestinationDecision.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_setDefaultDestinationDecision.xml?rev=38793&r1=38792&r2=38793&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_setDefaultDestinationDecision.xml [utf8] (original)
+++ experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_setDefaultDestinationDecision.xml [utf8] Thu Sep 30 13:36:18 2010
@@ -72,7 +72,7 @@ for destination in destination_list:\n
 \n
 if "Organisation" in create_portal_type:\n
   #Try to find existant organisation\n
-  organisation_title = context.getCorporateName()\n
+  organisation_title = context.getOrganisationTitle()\n
   module = context.getDefaultModule("Organisation")  \n
   organisation_list = module.searchFolder(title=organisation_title)\n
   #be sure we have the same title and no %title%\n

Modified: experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_view/my_organisation_title.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_view/my_organisation_title.xml?rev=38793&r1=38792&r2=38793&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_view/my_organisation_title.xml [utf8] (original)
+++ experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_view/my_organisation_title.xml [utf8] Thu Sep 30 13:36:18 2010
@@ -9,7 +9,9 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list/>
+              <list>
+                <string>title</string>
+              </list>
             </value>
         </item>
         <item>
@@ -51,12 +53,6 @@
             <value>
               <dictionary>
                 <item>
-                    <key> <string>default</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
-                <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
                 </item>
@@ -76,10 +72,6 @@
             <value>
               <dictionary>
                 <item>
-                    <key> <string>description</string> </key>
-                    <value> <string>The usual name of the organisation.</string> </value>
-                </item>
-                <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_title</string> </value>
                 </item>
@@ -93,7 +85,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Usual Name</string> </value>
+                    <value> <string>Organisation Usual Name</string> </value>
                 </item>
               </dictionary>
             </value>
@@ -101,23 +93,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>here/getTitle</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>

Modified: experimental/bt5/erp5_credential/bt/revision
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/bt/revision?rev=38793&r1=38792&r2=38793&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/bt/revision [utf8] (original)
+++ experimental/bt5/erp5_credential/bt/revision [utf8] Thu Sep 30 13:36:18 2010
@@ -1 +1 @@
-225
\ No newline at end of file
+228
\ No newline at end of file