[Erp5-report] r35891 mayoro - in /erp5/trunk/bt5/erp5_egov: ExtensionTemplateItem/ SkinTemp...

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Jun 2 13:41:19 CEST 2010


Author: mayoro
Date: Wed Jun  2 13:41:17 2010
New Revision: 35891

URL: http://svn.erp5.org?rev=35891&view=rev
Log:
2010-06-02 mayoro
* rename extension for egov security
* remove some word added by mistakes
* remove unused extension SetUpInstance

Added:
    erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/EGovSecurity.py
Modified:
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_setPermissionsOnEGovModule.xml
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_sendCrendentialsByEMail.xml
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Person_sendCrendentialsByEMail.xml
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/PDFDocument_viewLoginInformationPT.xml
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/EGov_getWorkflowHistoryItemList.xml
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewBecomeVipRenderer.xml
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderFormRenderer.xml
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderWorkspaceRenderer.xml
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml
    erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.xml
    erp5/trunk/bt5/erp5_egov/bt/change_log
    erp5/trunk/bt5/erp5_egov/bt/revision
    erp5/trunk/bt5/erp5_egov/bt/template_extension_id_list

Added: erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/EGovSecurity.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/EGovSecurity.py?rev=35891&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/EGovSecurity.py (added)
+++ erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/EGovSecurity.py [utf8] Wed Jun  2 13:41:17 2010
@@ -1,0 +1,322 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2002-2007 Nexedi SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from Products.ERP5Security.ERP5GroupManager import ConsistencyError
+from Products.ERP5Type import Permissions
+
+#############################################################
+## Define permissions on EGov modules
+#############################################################
+
+def setPermissionsOnEGovModule(self, portal_type_object):
+  """
+  This script sets the permissions on erp5 roles
+  according to a procedure settings in the request hosting form
+  """
+  #XXX Complete Permissions class in Products.ERP5Type 
+  #include all zope permissions
+  aquired_permission_list= [ 'Access Transient Objects','Access arbitrary user session data'
+                           , 'Access session data',  'Add Accelerated HTTP Cache Managers'
+                           , 'Add Browser Id Manager','Add CMF Action Icons Tools'
+                           , 'Add CMF Setup Tools','Add CMF Unique Id Tools'
+                           , 'Add Configured CMF Sites','Add ERP5 Form Printouts'
+                           , 'Add Plugin Registrys', 'Add RAM Cache Managers'
+                           , 'Add ReStructuredText Documents','Add Session Data Manager'
+                           , 'Add Site Roots','Add Temporary Folder', 'Add Transient Object Container'
+                           , 'Add Virtual Host Monsters','Add Z Gadfly Database Connections'
+                           , 'Add ZODB Mount Points','Add Zope Tutorials','Change Browser Id Manager'
+                           , 'Change Session Data Manager', 'Create Transient Objects'
+                           , 'Edit ReStructuredText','Manage Transient Object Container'
+                           ]
+  zope_permission_list =  [
+                          'Access contents information','Access future portal content',
+                          'Access inactive portal content','Add BTreeFolder2s',
+                          'Add CMF Active Processs','Add CMF Caching Policy Managers',
+                          'Add CMF Calendar Tools','Add CMF Core Tools',
+                          'Add CMF Default Tools', 'Add CMF Sites',
+                          'Add CMFActivity Tools','Add CMFCategory Tools',
+                          'Add CMFMailIn Tools', 'Add Content Type Registrys','Add Cookie Crumblers',
+                          'Add Database Methods','Add Documents, Images, and Files',
+                          'Add ERP5 Filesystem Formulator Forms',
+                          'Add ERP5 Forms','Add ERP5 OOo Templates',
+                          'Add ERP5 PDF Forms','Add ERP5 PDF Templates',
+                          'Add ERP5 Publications','Add ERP5 Reports',
+                          'Add ERP5 Sites','Add ERP5 Subscriptions',
+                          'Add ERP5 Tools','Add ERP5Catalog Tools',
+                          'Add ERP5Form Tools','Add ERP5Subversion Tools',
+                          'Add ERP5SyncML Tools','Add ERP5Type Tools',
+                          'Add ExtFiles','Add ExtImages',
+                          'Add External Methods','Add Filesystem Directory Views',
+                          'Add Folders','Add Formulator Forms',
+                          'Add LocalContents','Add LocalFolders',
+                          'Add Localizers','Add MailHost objects',
+                          'Add MessageCatalogs','Add MimetypesRegistry Tools',
+                          'Add Page Templates','Add Pluggable Index',
+                          'Add PortalTransforms Tools',
+                          'Add Python Scripts','Add User Folders',
+                          'Add Vocabularies', 'Add Z MySQL Database Connections',
+                          'Add Z MySQL Deferred Database Connections','Add ZCatalogs',
+                          'Add ZMailIn Clients','Add ZMailMessages',
+                          'Add portal content','Add portal events',
+                          'Add portal folders','Add portal member',
+                          'Add portal topics','Change DTML Documents','Change DTML Methods',
+                          'Change Database Connections','Change Database Methods',
+                          'Change ExtFile/ExtImage','Change External Methods',
+                          'Change Formulator Fields','Change Formulator Forms',
+                          'Change Images and Files','Change Lock Information',
+                          'Change Page Templates','Change Python Scripts',
+                          'Change Versions', 'Change ZMailIn','Change ZMailMessages',
+                          'Change bindings','Change cache managers',
+                          'Change cache settings','Change configuration',
+                          'Change local roles','Change permissions',
+                          'Change portal events','Change portal topics',
+                          'Change proxy roles','Copy or Move','Create class instances',
+                          'Define permissions','Delete objects',
+                          'Download ExtFile/ExtImage','Edit Factories',
+                          'Edit target','FTP access','Import/Export objects',
+                          'Join/leave Versions','List folder contents',
+                          'List portal members','List undoable changes',
+                          'Log Site Errors','Log to the Event Log',
+                          'Mail forgotten password','Manage Access Rules',
+                          'Manage Groups','Manage Selenium test cases',
+                          'Manage Vocabulary','Manage WebDAV Locks','Manage Z Classes',
+                          'Manage ZCatalog Entries','Manage ZCatalogIndex Entries',
+                          'Manage languages','Manage messages',
+                          'Manage portal','Manage properties',
+                          'Manage users','Modify Cookie Crumblers',
+                          'Modify portal content','Open/Close Database Connection',
+                          'Open/Close Database Connections','Post mail to ZMailIn',
+                          'Query Vocabulary','Reply to item','Request review',
+                          'Review portal content','Save/discard Version changes',
+                          'Search ZCatalog','Search for principals',
+                          'Set own password','Set own properties',
+                          'Take ownership','Test Database Connections',
+                          'Translate Content','Undo changes',
+                          'Use Database Methods','Use Factories',
+                          'Use external editor','Use mailhost services',
+                          'View','View History',
+                          'View ZMailMessage','View management screens',
+                          'WebDAV Lock items','WebDAV Unlock items',
+                          'WebDAV access',
+                          ]
+
+
+  role_permission_dict =  {'Anonymous':[Permissions.AccessContentsInformation, Permissions.AddPortalContent \
+                                       ,Permissions.CopyOrMove, Permissions.ModifyPortalContent \
+                                       ,Permissions.ListFolderContents,Permissions.View, 'View History' \
+                                       ],
+                           'Agent':    [Permissions.AccessContentsInformation, Permissions.AddPortalContent \
+                                       ,Permissions.CopyOrMove, Permissions.ModifyPortalContent \
+                                       ,Permissions.ListFolderContents,Permissions.View, 'View History' \
+                                       ],
+                           'Associate':[Permissions.AccessContentsInformation, Permissions.ListFolderContents \
+                                       ,Permissions.View, Permissions.CopyOrMove, 'View History'  \
+                                       ],
+                           'Auditor':  [Permissions.AccessContentsInformation, Permissions.ListFolderContents  \
+                                       ,Permissions.View, 'View History' \
+                                       ],
+                           'Assignee': [Permissions.AccessContentsInformation, Permissions.ListFolderContents \
+                                       ,Permissions.CopyOrMove, Permissions.View, 'View History' \
+                                       ],
+                           'Assignor': [Permissions.AccessContentsInformation, Permissions.AddPortalContent \
+                                       ,Permissions.AddPortalFolders, Permissions.CopyOrMove \
+                                       ,Permissions.View, Permissions.ModifyPortalContent \
+                                       ,Permissions.DeleteObjects, Permissions.ListFolderContents, 'View History' \
+                                       ],
+                           'Manager':  zope_permission_list
+                          }
+
+  #XXX if the procedure needs no authentification, 
+  # assume anonymous role can access and add
+  if portal_type_object is not None:
+    step_authentication =  portal_type_object.getStepAuthentication()
+  self.manage_acquiredPermissions(aquired_permission_list)
+  for (role, permission_list) in role_permission_dict.items():
+    if role == "Anonymous" and not step_authentication:
+      self.manage_role(role_to_manage=role, permissions=permission_list)
+    elif role != "Anonymous":
+      self.manage_role(role_to_manage=role, permissions=permission_list)
+      if role == "Agent":
+        portal_type_object.manage_role(role_to_manage=role, permissions=permission_list)
+
+def getSecurityCategoryFromAssignment(self, base_category_list, user_name, 
+    object, portal_type, child_category_list=[]):
+  """
+  This script returns a list of dictionaries which represent
+  the security groups which a person is member of. It extracts
+  the categories from the current user assignment.
+  It is useful in the following cases:
+  
+  - associate a document (ex. an accounting transaction)
+    to the division which the user was assigned to
+    at the time it was created
+  
+  - calculate security membership of a user
+  
+  The parameters are
+  
+    base_category_list -- list of category values we need to retrieve
+    user_name          -- string obtained from 
+                                        getSecurityManager().getUser().getId()
+    object             -- object which we want to assign roles to
+    portal_type        -- portal type of object
+  """
+  category_list = []
+  person_object_list = self.portal_catalog.unrestrictedSearchResults(\
+                                portal_type='Person', reference=user_name)
+  
+  if len(person_object_list) != 1:
+    if len(person_object_list) > 1:
+      raise ConsistencyError, "Error: There is more than one Person with reference '%s'" % user_name
+    else:
+      # if a person_object was not found in the module, we do nothing more
+      # this happens for example when a manager with no associated person 
+      # object creates a person_object for a new user
+      return []
+  person_object = person_object_list[0].getObject()
+  
+  # We look for every valid assignments of this user
+  assignment_list = person_object.contentValues(filter={'portal_type':'Assignment'})
+  for assignment in assignment_list:
+    if assignment.getValidationState() == 'open':
+      category_dict = {}
+      for base_category in base_category_list:
+        category_value_list = assignment.getAcquiredValueList(base_category)
+        if category_value_list:
+          for category_value in category_value_list:
+            if base_category in child_category_list:
+              if category_value.getPortalType() not in \
+                  ('Base Category', 'ERP5 Site'):
+                while category_value.getPortalType() not in \
+                    ('Base Category', 'ERP5 Site'):
+                  category_dict.setdefault(base_category, []).append('%s*' % \
+                      category_value.getRelativeUrl())
+                  category_value = category_value.getParentValue()
+              else:
+                category_dict.setdefault(base_category, []).append(category_value.getRelativeUrl())
+            else:
+              category_dict.setdefault(base_category, []).append(category_value.getRelativeUrl())
+      category_list.append(category_dict)
+  
+  return category_list
+
+
+def getSecurityCategoryFromEntity(self, base_category_list, entity_name, 
+    object, portal_type, child_category_list=None, portal_type_list=None):
+  """
+  This script returns a list of dictionaries which represent
+  the security groups which a person is member of. It extracts
+  the categories from the current user assignment.
+  It is useful in the following cases:
+  
+  - associate a document (ex. an accounting transaction)
+    to the division which the user was assigned to
+    at the time it was created
+  
+  - calculate security membership of a user
+  
+  The parameters are
+  
+    base_category_list -- list of category values we need to retrieve
+    entity_name          -- string obtained from 
+                                        getSecurityManager().getUser().getId()
+    object             -- object which we want to assign roles to
+    portal_type_list   -- list of portal type to search the entity
+  """
+  if portal_type_list is None:
+    portal_type_list = self.portal_type_list
+  if child_category_list is None:
+    child_category_list = []
+
+  category_list = []
+  object_list = self.portal_catalog.unrestrictedSearchResults(portal_type=portal_type_list, reference=entity_name)
+  
+  if len(object_list) != 1:
+    if len(object_list) > 1:
+      raise ConsistencyError, "Error: There is more than one Entity with reference '%s'" % entity_name
+    else:
+      # if a person_object was not found in the module, we do nothing more
+      # this happens for example when a manager with no associated person 
+      # object creates a person_object for a new user
+
+      portal = self.getPortalObject()
+
+      # this permit to get the module of the application. The goal is to
+      # work with anonymous applications, even if they are not reindexed
+      module_id = self.REQUEST.get('anonymous_module', None)
+      if module_id:
+        module =  getattr(portal, module_id, None)
+        if module is not None:
+          result = module._getOb(entity_name, None)
+          if result is not None:
+            object = result
+          else:
+            return []
+      else:
+        return []
+  else:
+    object = object_list[0].getObject()
+  
+  category_dict = {}
+  for base_category in base_category_list:
+    category_value_list = object.getAcquiredValueList(base_category)
+    if category_value_list:
+      for category_value in category_value_list:
+        if base_category in child_category_list:
+          if category_value.getPortalType() not in \
+              ('Base Category', 'ERP5 Site'):
+            while category_value.getPortalType() not in \
+                ('Base Category', 'ERP5 Site'):
+              category_dict.setdefault(base_category, []).append('%s*' % \
+                  category_value.getRelativeUrl())
+              category_value = category_value.getParentValue()
+          else:
+            category_dict.setdefault(base_category, []).append(category_value.getRelativeUrl())
+        else:
+          category_dict.setdefault(base_category, []).append(category_value.getRelativeUrl())
+  category_list.append(category_dict)
+  
+  return category_list
+
+
+
+def getSecurityCategoryFromAssignmentParent(self, base_category_list,
+                                       user_name, object, portal_type):
+  return getSecurityCategoryFromAssignment(self, base_category_list,
+                                       user_name, object, portal_type, child_category_list=base_category_list)
+
+def getSecurityCategoryFromAssignmentParentGroup(self, base_category_list,
+                                       user_name, object, portal_type):
+  return getSecurityCategoryFromAssignment(self, base_category_list,
+                                       user_name, object, portal_type, child_category_list=('group',))
+ 
+def getSecurityCategoryFromAssignmentParentFunction(self, base_category_list,
+                                       user_name, object, portal_type):
+  return getSecurityCategoryFromAssignment(self, base_category_list,
+                                       user_name, object, portal_type, child_category_list=('function',))
+

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_setPermissionsOnEGovModule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_setPermissionsOnEGovModule.xml?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_setPermissionsOnEGovModule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_setPermissionsOnEGovModule.xml [utf8] Wed Jun  2 13:41:17 2010
@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>_module</string> </key>
-            <value> <string>SAFISecurity</string> </value>
+            <value> <string>EGovSecurity</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_sendCrendentialsByEMail.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_sendCrendentialsByEMail.xml?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_sendCrendentialsByEMail.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_sendCrendentialsByEMail.xml [utf8] Wed Jun  2 13:41:17 2010
@@ -83,8 +83,8 @@
 organisation = result[0]\n
 \n
 # Build the message and translate it\n
-subject = translateString("Your credential for ${site_address}", mapping=dict(site_address=\'www.safi.sn\'))\n
-msg = """Thanks for registrering to SAFI. Now you can connect in on ${site_address} with this credentials : \n
+subject = translateString("Your credential for ${site_address}", mapping=dict(site_address=\'www.erp5.org\'))\n
+msg = """Thanks for registrering to ERP5. Now you can connect in on ${site_address} with this credentials : \n
 \n
 Login : ${login}\n
 Password : ${password}\n
@@ -92,7 +92,7 @@
 This credentials are usefull to track your application and more. Please visit ${site_address} for more information.\n
 """\n
 msg = translateString(msg,\n
-             mapping=dict(site_address=\'www.safi.sn\',\n
+             mapping=dict(site_address=\'www.erp5.org\',\n
                           login=organisation.getReference(),\n
                           password=organisation.getPassword())\n
             )\n

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Person_sendCrendentialsByEMail.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Person_sendCrendentialsByEMail.xml?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Person_sendCrendentialsByEMail.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Person_sendCrendentialsByEMail.xml [utf8] Wed Jun  2 13:41:17 2010
@@ -87,8 +87,8 @@
 person = result[0]\n
 \n
 # Build the message and translate it\n
-subject = translateString("Your credential for ${site_address}", mapping=dict(site_address=\'www.safi.sn\'))\n
-msg = """Thanks for registrering to SAFI. Now you can connect in on ${site_address} with this credentials : \n
+subject = translateString("Your credential for ${site_address}", mapping=dict(site_address=\'www.erp5.org\'))\n
+msg = """Thanks for registrering to ERP5 EGov. Now you can connect in on ${site_address} with this credentials : \n
 \n
 Login : ${login}\n
 Password : ${password}\n
@@ -96,7 +96,7 @@
 This credentials are usefull to track your application and more. Please visit ${site_address} for more information.\n
 """\n
 msg = translateString(msg,\n
-             mapping=dict(site_address=\'www.safi.sn\',\n
+             mapping=dict(site_address=\'www.erp5.org\',\n
                           login=person.getReference(),\n
                           password=not_encrypt_password)\n
             )\n

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/PDFDocument_viewLoginInformationPT.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/PDFDocument_viewLoginInformationPT.xml?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/PDFDocument_viewLoginInformationPT.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/PDFDocument_viewLoginInformationPT.xml [utf8] Wed Jun  2 13:41:17 2010
@@ -55,7 +55,7 @@
   </tal:bloc>\n
 </div>\n
 <div class="site_address">\n
-  <a href="http://www.safi.sn">http://www.safi.sn</a>\n
+  <a href="http://www.erp5.org">http://www.erp5.org</a>\n
 </div>\n
 <tal:bloc tal:condition="python: here.getPortalType() == \'Subscription Form\'">\n
   <div class="login_and_password">\n

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/EGov_getWorkflowHistoryItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/EGov_getWorkflowHistoryItemList.xml?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/EGov_getWorkflowHistoryItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/EGov_getWorkflowHistoryItemList.xml [utf8] Wed Jun  2 13:41:17 2010
@@ -66,14 +66,7 @@
   my_group = None\n
 \n
 \n
-\n
-# XXX very bad but I don\'t know where workflow_id=egov_universal_workflow is hardcoded\n
-#if context.getPortalType() == "Subscription Form":\n
-#  workflow_id = "egov_safi_tva_anonymous_workflow"\n
-#elif context.getPortalType() == "Declaration TVA" or  context.getPortalType() == "Declaration TVA Empty" or  context.getPortalType() == "Declaration TVA Amendment":\n
-#  workflow_id = "egov_safi_tva_universal_workflow"\n
-\n
-workflow_id = "egov_universal_workflow"\n
+#workflow_id = "egov_universal_workflow"\n
 \n
 my_group = context.getTypeInfo().getOrganisationDirectionService()\n
 \n

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewBecomeVipRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewBecomeVipRenderer.xml?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewBecomeVipRenderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewBecomeVipRenderer.xml [utf8] Wed Jun  2 13:41:17 2010
@@ -57,13 +57,13 @@
     </div>\n
     <div class="become_vip_explanations">\n
       <tal:block i18n:domain="ui" i18n:translate="">\n
-      Safi is a major Internet portal for performing administrative formalities\n
+      ERP5 EGov is a major Internet portal for performing administrative formalities\n
       online. It is a quick and easy way to make a statement, or a application for\n
       jutificatif,... without having to move or to queue. For more\n
       information, please click\n
       </tal:block>\n
       <a href="help/registerInformations" onclick="window.open(this.href,\n
-        \'safi_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\');\n
+        \'egov_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\');\n
         return false;" i18n:translate="" i18n:domain="ui">here</a>\n
     </div>\n
     <tal:block metal:use-macro="here/WebSite_viewRegisterButton/macros/main"/>\n

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderFormRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderFormRenderer.xml?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderFormRenderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderFormRenderer.xml [utf8] Wed Jun  2 13:41:17 2010
@@ -56,7 +56,7 @@
         <a class="print" href="PDFDocument_viewAsPdf"\n
           tal:attributes="href python: context.getPrintFormUrl()" i18n:translate="" i18n:domain="ui">Print</a>\n
       </tal:block>      \n
-      <a class="help" href="EGov_helpWithContext"  tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" onclick="window.open(this.href, \'safi_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
+      <a class="help" href="EGov_helpWithContext"  tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" onclick="window.open(this.href, \'egov_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
     </span>\n
   </div>\n
 </div>\n

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderWorkspaceRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderWorkspaceRenderer.xml?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderWorkspaceRenderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderWorkspaceRenderer.xml [utf8] Wed Jun  2 13:41:17 2010
@@ -62,9 +62,9 @@
         <a class="preferences" href="./preferences" i18n:translate="" i18n:domain="ui">Preferences</a>\n
       </tal:block>\n
       -->\n
-      <a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()"  onclick="window.open(this.href, \'safi_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
+      <a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()"  onclick="window.open(this.href, \'egov_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
     </span><br /><br />\n
-    <span class="site_title" i18n:translate="" i18n:domain="ui">SAFI - Online Procedures</span>\n
+    <span class="site_title" i18n:translate="" i18n:domain="ui">EGov - Online Procedures</span>\n
   \n
     <hr/>\n
   \n

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml [utf8] Wed Jun  2 13:41:17 2010
@@ -61,7 +61,7 @@
           tal:attributes="href python: context.getPrintFormUrl()" i18n:translate="" i18n:domain="ui">Print</a>\n
       </tal:block>\n
       <!--<a class="help" href="EGov_helpWithContext"  tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" i18n:translate="" i18n:domain="ui">Help</a>-->\n
-      <a class="help" href="EGov_helpWithContext"  tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" onclick="window.open(this.href, \'safi_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
+      <a class="help" href="EGov_helpWithContext"  tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" onclick="window.open(this.href, \'egov_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
     </span><hr/>\n
 \n
   </div>\n

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml [utf8] Wed Jun  2 13:41:17 2010
@@ -62,10 +62,10 @@
         <a class="preferences" href="./preferences" i18n:translate="" i18n:domain="ui">Preferences</a>\n
       </tal:block>\n
       -->\n
-      <a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()"  onclick="window.open(this.href, \'safi_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
+      <a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()"  onclick="window.open(this.href, \'egov_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
 \n
     </span><br /><br />\n
-    <span class="site_title" i18n:translate="" i18n:domain="ui">SAFI - Online Procedures</span>\n
+    <span class="site_title" i18n:translate="" i18n:domain="ui">EGov - Online Procedures</span>\n
     \n
     <hr/>\n
   \n

Modified: erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.xml?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.xml [utf8] Wed Jun  2 13:41:17 2010
@@ -78,7 +78,7 @@
 procedure=translateString(form.getPortalType())\n
 \n
 \n
-wf_info=form.Egov_getProcedureWorkflowStateInfo(\'egov_safi_tva_universal_workflow\',\'submitted\')\n
+wf_info=form.Egov_getProcedureWorkflowStateInfo(\'egov_universal_workflow\',\'submitted\')\n
 date_of_submission=wf_info[\'time\'].strftime(\'%d/%m/%y %H:%M\')\n
 \n
 subject = translateString("[SAFI] Your ${procedure} document number: ${form_id} has been submitted", \n

Modified: erp5/trunk/bt5/erp5_egov/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/change_log?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] Wed Jun  2 13:41:17 2010
@@ -1,10 +1,13 @@
+2010-06-02 mayoro
+* rename extension for egov security
+* remove some word added by mistakes
+* remove unused extension SetUpInstance
+
 2010-06-01 mayoro
-* remove safi_egov
+* remove portal_skins added by mistake
 
 2010-06-01 mayoro
 * New version of ERP5 egov based on dynamic form generated from sla and pdf files defined on portal_types
-
-
 
 2009-09-07 yusuke
 * Replace ERP5Report to ERP5Form and ReportBox

Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision [utf8] Wed Jun  2 13:41:17 2010
@@ -1,1 +1,1 @@
-512
+521

Modified: erp5/trunk/bt5/erp5_egov/bt/template_extension_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/template_extension_id_list?rev=35891&r1=35890&r2=35891&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/template_extension_id_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/template_extension_id_list [utf8] Wed Jun  2 13:41:17 2010
@@ -1,4 +1,3 @@
 Captcha
 ERP5EGov_Extensions
-SetUpInstance
-SAFISecurity
+EGovSecurity




More information about the Erp5-report mailing list