[Erp5-report] r44039 jm - in /erp5/trunk: bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Mar 8 11:06:56 CET 2011


Author: jm
Date: Tue Mar  8 11:06:56 2011
New Revision: 44039

URL: http://svn.erp5.org?rev=44039&view=rev
Log:
ERP5VCS: add preference to or not to push local commits by default

Added:
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs/my_preferred_vcs_push_mode.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference/preferred_vcs_push_mode_property.xml
Modified:
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/your_push.xml
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs.xml
    erp5/trunk/bt5/erp5_forge/bt/revision
    erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/bt/revision

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/your_push.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/your_push.xml?rev=44039&r1=44038&r2=44039&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/your_push.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/your_push.xml [utf8] Tue Mar  8 11:06:56 2011
@@ -11,7 +11,6 @@
             <value>
               <list>
                 <string>default</string>
-                <string>editable</string>
                 <string>enabled</string>
                 <string>title</string>
               </list>
@@ -62,15 +61,9 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>editable</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-                    </value>
-                </item>
-                <item>
                     <key> <string>enabled</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -101,10 +94,6 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key> <string>editable</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
                     <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
@@ -138,7 +127,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: field.get_value(\'editable\')</string> </value>
+            <value> <string>preferences/getPreferredVcsPushMode</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -151,19 +140,6 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: not here.getVcsTool().getAheadCount()</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
             <value> <string>python: here.getVcsTool().reference != \'svn\'</string> </value>
         </item>
       </dictionary>

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs.xml?rev=44039&r1=44038&r2=44039&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs.xml [utf8] Tue Mar  8 11:06:56 2011
@@ -75,6 +75,7 @@
                         <string>my_preferred_git_author</string>
                         <string>my_preferred_subversion_user_name</string>
                         <string>my_preferred_working_copy_list</string>
+                        <string>my_preferred_vcs_push_mode</string>
                       </list>
                     </value>
                 </item>

Added: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs/my_preferred_vcs_push_mode.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs/my_preferred_vcs_push_mode.xml?rev=44039&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs/my_preferred_vcs_push_mode.xml (added)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs/my_preferred_vcs_push_mode.xml [utf8] Tue Mar  8 11:06:56 2011
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list>
+                <string>title</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>my_preferred_vcs_push_mode</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string>my_checkbox</string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string>Base_viewFieldLibrary</string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string>Click to edit the target</string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Push Local Commits</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=44039&r1=44038&r2=44039&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision [utf8] Tue Mar  8 11:06:56 2011
@@ -1 +1 @@
-645
\ No newline at end of file
+646
\ No newline at end of file

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference.xml?rev=44039&r1=44038&r2=44039&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference.xml [utf8] Tue Mar  8 11:06:56 2011
@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>last_id</string> </key>
-            <value> <string>5</string> </value>
+            <value> <string>6</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>

Added: erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference/preferred_vcs_push_mode_property.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference/preferred_vcs_push_mode_property.xml?rev=44039&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference/preferred_vcs_push_mode_property.xml (added)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference/preferred_vcs_push_mode_property.xml [utf8] Tue Mar  8 11:06:56 2011
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/boolean</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Set default value of "Push" checkbox in dialog to commit changes to a DVCS working copy</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>preferred_vcs_push_mode_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+        <item>
+            <key> <string>preference</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>property_default</string> </key>
+            <value> <string>python: True</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/bt/revision?rev=44039&r1=44038&r2=44039&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_property_sheets/bt/revision [utf8] Tue Mar  8 11:06:56 2011
@@ -1 +1 @@
-6
+7
\ No newline at end of file



More information about the Erp5-report mailing list