erp5_forge: start to break vcs for erp5js

erp5_force: break by dropping the custom page template

erp5_forge: drop vcs_dialog

erp5_forge: use Base_redirect

erp5_forge: use formulator to propagate the values

erp5_forge drop some fields from changelog form

erp5_forge:

erp5_forge: stop accessing the request to pass arguments

erp5_forge: commit from xhtml_style and from erp5js

erp5_forge: remove comment

erp5_forge: drop useless comment

bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.Git.py

@@ -321,10 +321,8 @@ class Git(WorkingCopy):
       return self.git('rev-parse', '--short', 'HEAD') + '+'
     return self.git('rev-parse', 'HEAD')
 
-  def commit(self, changelog, added=(), modified=(), removed=()):
+  def commit(self, changelog, push, added=(), modified=(), removed=()):
     context = self.aq_parent
-    request = context.REQUEST
-    push = request.get('push')
     reset = 1
     if push:
       # if we can't push because we are not up-to-date, we'll either 'merge' or
@@ -390,9 +388,9 @@ class Git(WorkingCopy):
       portal_status_message = translateString(
         'Files committed successfully in revision ${revision}',
         mapping=dict(revision=head))
-    return request.RESPONSE.redirect('%s/view?%s' % (
-      context.absolute_url_path(),
-      make_query(portal_status_message=portal_status_message)))
+    return context.Base_redirect('view', keep_items={
+      'portal_status_message': portal_status_message
+    })
 
   def log(self, path='.'):
     log = []

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doCreateWorkingCopy.py

-from ZTUtils import make_query
+from Products.ERP5Type.Message import translateString
+
 form_results = context.BusinessTemplate_viewCreateWorkingCopy.validate_all(REQUEST)
 working_copy = form_results['your_repository']
 context.getVcsTool(path=working_copy).createBusinessTemplateWorkingCopy()
 
-query_string = make_query(portal_status_message='Business Template Working Copy created')
-REQUEST.response.redirect('%s/BusinessTemplate_viewVcsStatus?%s' % 
-                          (context.absolute_url_path(), query_string))
+return context.Base_redirect('BusinessTemplate_viewVcsStatus', keep_items=dict(
+  portal_status_message=translateString('Business Template Working Copy created')
+))

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsCommit.py

-kw = {}
-request = container.REQUEST
-for k in 'added', 'modified', 'removed':
-  file_list = request.get(k, ())
+import json
+
+context.log('BusinessTemplate_viewVcsStatusDialog\nchnagelog %s\npush %s\nadded %s\nmodified %s\nremoved %s\njson %s\nkw %s' % (changelog, push, added, modified, removed, commit_json, str(kw)))
+
+
+commit_dict = json.loads(commit_json) if commit_json is not None else {
+  'added': (),
+  'modified': (),
+  'removed': (),
+  'changelog': '',
+  'push': False
+}
+
+for key, file_list in (('added', added), ('modified', modified), ('removed', removed)):
+
+  if file_list is not None:
     # XXX: ERP5VCS_doCreateJavaScriptStatus should send lists
     if isinstance(file_list, basestring):
       file_list = file_list != 'none' and filter(None, file_list.split(',')) or ()
-  kw[k] = file_list
+    commit_dict[key] = file_list
+
+if changelog is not None:
+  commit_dict['changelog'] = changelog
+if push is not None:
+  commit_dict['push'] = push
+
+# Remover keys used when handling commit exception
+commit_dict.pop('caller', None)
+commit_dict.pop('caller_kw', None)
+
+# Always propage all informations throught formulator hidden field
+request = context.REQUEST
+request.form['your_commit_json'] = json.dumps(commit_dict)
+request.form['your_added'] = commit_dict['added']
+request.form['your_modified'] = commit_dict['modified']
+request.form['your_removed'] = commit_dict['removed']
 
-changelog = request.get('changelog', '')
-if not changelog.strip():
+if commit_dict['changelog'].strip():
+  request.form['your_changelog'] = commit_dict['changelog']
+else:
   from Products.ERP5Type.Message import translateString
   error_msg = "Please set a ChangeLog message."
-  request.set('portal_status_message', translateString(error_msg))
-  request.set('cancel_url', context.absolute_url() +
+  return context.Base_renderForm('BusinessTemplate_viewVcsChangelog', keep_items={
+    'portal_status_message': translateString(error_msg),
+    'cancel_url': context.absolute_url() +
       '/BusinessTemplate_viewVcsStatus?do_extract:int=0'
-    '&portal_status_message=Commit%20cancelled.')
-  return context.asContext(**kw).BusinessTemplate_viewVcsChangelog()
+      '&portal_status_message=Commit%20cancelled.'
+  })
 
 try:
-  return context.getVcsTool().commit(changelog, **kw)
+  return context.getVcsTool().commit(
+    commit_dict['changelog'],
+    commit_dict['push'],
+    added=commit_dict['added'],
+    modified=commit_dict['modified'],
+    removed=commit_dict['removed']
+  )
 except Exception, error:
-  return context.BusinessTemplate_handleException(error, script.id)
+  return context.BusinessTemplate_handleException(error, script.id, commit_dict=commit_dict)

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsCommit.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>**kw</string> </value>
+            <value> <string>push=None, changelog=None, added=None, modified=None, removed=None, commit_json=None, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsLogin.py

-if caller_kw is None:
-  caller_kw = {}
 context.getVcsTool().setLogin(auth, user, password)
 
-return context.restrictedTraverse(caller)(**caller_kw)
+import json
+commit_dict = json.loads(commit_json)
+return context.restrictedTraverse(commit_dict['caller'].encode())(commit_json=commit_json)

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsLogin.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>user, password, auth, caller, caller_kw=None, added=(), modified=(), removed=(), changelog=None, **kw</string> </value>
+            <value> <string>user, password, auth, commit_json, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_handleException.py

 from erp5.component.module.Git import GitLoginError
 from erp5.component.module.SubversionClient import SubversionSSLTrustError, SubversionLoginError
+import json
 
 try:
   raise exception
@@ -16,5 +17,12 @@ except GitLoginError, e:
   kw = dict(remote_url=context.getVcsTool().getRemoteUrl())
   method = 'BusinessTemplate_viewGitLogin'
 
-context.REQUEST.set('portal_status_message', message)
-return getattr(context.asContext(**kw), method)(caller=caller, caller_kw=caller_kw)
+commit_dict['caller'] = caller
+# XXX caller_kw
+# Always propage all informations throught formulator hidden field
+request = context.REQUEST
+request.form['your_commit_json'] = json.dumps(commit_dict)
+
+return context.Base_renderForm(method, keep_items={
+  'portal_status_message': message
+})

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_handleException.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>exception, caller, **caller_kw</string> </value>
+            <value> <string>exception, caller, commit_dict, **caller_kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewGitLogin.xml

@@ -37,6 +37,10 @@
             <key> <string>action</string> </key>
             <value> <string>BusinessTemplate_doVcsLogin</string> </value>
         </item>
+        <item>
+            <key> <string>action_title</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
@@ -74,7 +78,9 @@
                 <item>
                     <key> <string>bottom</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <string>your_commit_json</string>
+                      </list>
                     </value>
                 </item>
                 <item>
@@ -123,7 +129,7 @@
         </item>
         <item>
             <key> <string>pt</string> </key>
-            <value> <string>vcs_dialog</string> </value>
+            <value> <string>form_dialog</string> </value>
         </item>
         <item>
             <key> <string>row_length</string> </key>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewGitLogin/remote_url.xml

@@ -125,7 +125,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>here/remote_url</string> </value>
+            <value> <string>python: context.getVcsTool().getRemoteUrl()</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewSvnLogin.xml

@@ -37,6 +37,10 @@
             <key> <string>action</string> </key>
             <value> <string>BusinessTemplate_doVcsLogin</string> </value>
         </item>
+        <item>
+            <key> <string>action_title</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
@@ -102,7 +106,7 @@
         </item>
         <item>
             <key> <string>pt</string> </key>
-            <value> <string>vcs_dialog</string> </value>
+            <value> <string>form_dialog</string> </value>
         </item>
         <item>
             <key> <string>row_length</string> </key>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewSvnSSLTrust.xml

@@ -37,6 +37,10 @@
             <key> <string>action</string> </key>
             <value> <string>BusinessTemplate_doSvnSslTrust</string> </value>
         </item>
+        <item>
+            <key> <string>action_title</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
@@ -113,7 +117,7 @@
         </item>
         <item>
             <key> <string>pt</string> </key>
-            <value> <string>vcs_dialog</string> </value>
+            <value> <string>form_dialog</string> </value>
         </item>
         <item>
             <key> <string>row_length</string> </key>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog.xml

@@ -37,6 +37,10 @@
             <key> <string>action</string> </key>
             <value> <string>BusinessTemplate_doVcsCommit</string> </value>
         </item>
+        <item>
+            <key> <string>action_title</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
@@ -60,6 +64,7 @@
             <value>
               <list>
                 <string>center</string>
+                <string>bottom</string>
               </list>
             </value>
         </item>
@@ -67,6 +72,14 @@
             <key> <string>groups</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>bottom</string> </key>
+                    <value>
+                      <list>
+                        <string>your_commit_json</string>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>center</string> </key>
                     <value>
@@ -74,9 +87,9 @@
                         <string>your_push</string>
                         <string>your_changelog</string>
                         <string>reminder</string>
-                        <string>added_files</string>
-                        <string>modified_files</string>
-                        <string>removed_files</string>
+                        <string>your_added</string>
+                        <string>your_modified</string>
+                        <string>your_removed</string>
                       </list>
                     </value>
                 </item>
@@ -97,7 +110,7 @@
         </item>
         <item>
             <key> <string>pt</string> </key>
-            <value> <string>vcs_dialog</string> </value>
+            <value> <string>form_dialog</string> </value>
         </item>
         <item>
             <key> <string>row_length</string> </key>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/added_files.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/your_added.xml

@@ -10,7 +10,6 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>default</string>
                 <string>editable</string>
                 <string>title</string>
               </list>
@@ -18,7 +17,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>added_files</string> </value>
+            <value> <string>your_added</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -55,10 +54,8 @@
             <value>
               <dictionary>
                 <item>
-                    <key> <string>default</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
@@ -72,6 +69,10 @@
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
@@ -79,12 +80,6 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>default</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
@@ -111,17 +106,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: here.added</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/modified_files.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/your_modified.xml

@@ -10,7 +10,6 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>default</string>
                 <string>editable</string>
                 <string>title</string>
               </list>
@@ -18,7 +17,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>modified_files</string> </value>
+            <value> <string>your_modified</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -55,10 +54,8 @@
             <value>
               <dictionary>
                 <item>
-                    <key> <string>default</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
@@ -72,6 +69,10 @@
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
@@ -79,12 +80,6 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>default</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
@@ -111,17 +106,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: here.modified</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/removed_files.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/your_removed.xml

@@ -10,7 +10,6 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>default</string>
                 <string>editable</string>
                 <string>title</string>
               </list>
@@ -18,7 +17,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>removed_files</string> </value>
+            <value> <string>your_removed</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -55,10 +54,8 @@
             <value>
               <dictionary>
                 <item>
-                    <key> <string>default</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
@@ -72,6 +69,10 @@
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
@@ -79,12 +80,6 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>default</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
@@ -111,17 +106,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: here.removed</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsLog.xml

@@ -37,6 +37,10 @@
             <key> <string>action</string> </key>
             <value> <string>BusinessTemplate_doVcsMultiDiff</string> </value>
         </item>
+        <item>
+            <key> <string>action_title</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
@@ -110,7 +114,7 @@
         </item>
         <item>
             <key> <string>pt</string> </key>
-            <value> <string>vcs_dialog</string> </value>
+            <value> <string>form_dialog</string> </value>
         </item>
         <item>
             <key> <string>row_length</string> </key>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/vcs_dialog.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>content_type</string> </key>
-            <value> <string>text/html</string> </value>
-        </item>
-        <item>
-            <key> <string>expand</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>vcs_dialog</string> </value>
-        </item>
-        <item>
-            <key> <string>output_encoding</string> </key>
-            <value> <string>utf-8</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <unicode></unicode> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/vcs_dialog.zpt

-<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"
-           xmlns:metal="http://xml.zope.org/namespaces/metal"
-           xmlns:i18n="http://xml.zope.org/namespaces/i18n">
-  <tal:block define="local_parameter_list python: dict((x, request[x])
-                       for x in ('added', 'modified', 'removed', 'changelog', 'push')
-                       if x in request);
-                     dummy python: local_parameter_list.update((x, options.pop(x))
-                       for x in ('caller', 'caller_kw')
-                       if x in options)"
-             tal:on-error="structure python: here.BusinessTemplate_handleException(error.value, context.id)">
-    <tal:block metal:use-macro="here/form_dialog/macros/master" />
-  </tal:block>
-</tal:block>
\ No newline at end of file