[Erp5-report] r6295 - /erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal...

[nobody at svn.erp5.org]

Author: vincent
Date: Sat Mar 25 18:12:28 2006
New Revision: 6295

URL: http://svn.erp5.org?rev=6295&view=rev
Log:
Added erp5_web support (respect paths when there is an applicable context).

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callViewDialogMethod.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callViewDialogMethod.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callViewDialogMethod.xml?rev=6295&r1=6294&r2=6295&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callViewDialogMethod.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callViewDialogMethod.xml Sat Mar 25 18:12:28 2006
@@ -84,16 +84,12 @@
                                        )\n
 #Exceptions for Workflow\n
 if dialog_method == \'Workflow_statusModify\':\n
-  return context.Workflow_statusModify( form_id=form_id\n
+  value = context.Workflow_statusModify( form_id=form_id\n
                                        , dialog_id=dialog_id\n
                                        )\n
-#Exceptions for Mass Workflow Modifications\n
-if dialog_method == \'Folder_modifyWorkflowStatus\':\n
-  return context.Folder_modifyWorkflowStatus( form_id        = form_id\n
-                                            , dialog_id      = dialog_id\n
-                                            , selection_name = selection_name\n
-                                            )\n
-#Exceptions for UI configurations\n
+  if not(getattr(request, \'ignore_layout\', 0)) and context.getApplicableLayout() :\n
+    value = request.RESPONSE.redirect(context.WebSite_getDocumentPhysicalPath())\n
+  return value\n
 if dialog_method == \'Base_configureUI\':\n
   return context.Base_configureUI( form_id=form_id\n
                              , selection_name=selection_name\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml?rev=6295&r1=6294&r2=6295&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml Sat Mar 25 18:12:28 2006
@@ -268,7 +268,7 @@
 else:\n
   message = N_("Data+Updated.")\n
   if not(ignore_layout) and context.getApplicableLayout() :\n
-    redirect_url = \'%s?editable_mode=1\' % context.WebSite_getDocumentUrl()\n
+    redirect_url = \'%s?editable_mode=1\' % context.REQUEST.URL1\n
   elif not selection_index:\n
     redirect_url = \'%s/%s?portal_status_message=%s\' % ( context.absolute_url()\n
                               , form_id\n