diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml index 6321b5082d107231c2f637866c9d3c57d6262c89..b62897bfe08995b821fc90d277965c1dea4a96f7 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml @@ -72,6 +72,14 @@ from Products.ERP5Subversion.SubversionClient import SubversionSSLTrustError, SubversionLoginError\n \n +# XXX: To be compatible with commit from diff view\n +if same_type(added, []):\n + added = \',\'.join(added)\n +if same_type(modified, []):\n + modified = \',\'.join(modified)\n +if same_type(removed, []):\n + removed = \',\'.join(removed)\n +\n commit_non_recurs = added\n if commit_non_recurs != \'\' and commit_non_recurs != \'none\':\n if modified != \'\' and modified != \'none\':\n @@ -166,8 +174,9 @@ return context.BusinessTemplate_viewSvnStatus()\n <string>Products.ERP5Subversion.SubversionClient</string> <string>SubversionSSLTrustError</string> <string>SubversionLoginError</string> - <string>commit_non_recurs</string> + <string>same_type</string> <string>_getattr_</string> + <string>commit_non_recurs</string> <string>_getitem_</string> <string>context</string> <string>commit_recurs</string> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml index 1fe40eb023d836b0b48f3108e7681b448a64aa74..e30a703f80295b400c649e298ef2d589b638a63a 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml @@ -81,6 +81,7 @@ tab_Removed=removed.split(\',\')\n \n if modified != \'none\':\n for f in tab_Modified:\n + print \'<input name="modified" value="%s" type="checkbox" checked="checked" />\'%f\n f = context.getPortalObject()["portal_subversion"].relativeToAbsolute(f, context) \n print "<span style=\'font-weight: bold; color: black;\'>Index: <a href=\'BusinessTemplate_viewSvnShowFile?file="+f+"\'>"+f+"</a>"\n edit_path = context.getPortalObject()["portal_subversion"].editPath(context, f)\n @@ -92,6 +93,7 @@ if modified != \'none\':\n \n if added != \'none\':\n for f in tab_Added:\n + print \'<input name="added" value="%s" type="checkbox" checked="checked" />\'%f\n f = context.getPortalObject()["portal_subversion"].relativeToAbsolute(f, context) \n print "<span style=\'font-weight: bold; color: black;\'>Index: <a href=\'BusinessTemplate_viewSvnShowFile?file="+f+"\'>"+f+"</a>"\n edit_path = context.getPortalObject()["portal_subversion"].editPath(context, f)\n @@ -102,6 +104,7 @@ if added != \'none\':\n \n if removed != \'none\':\n for f in tab_Removed:\n + print \'<input name="removed" value="%s" type="checkbox" checked="checked" />\'%f\n f = context.getPortalObject()["portal_subversion"].relativeToAbsolute(f, context) \n print "<span style=\'font-weight: bold; color: black;\'>Index: <a href=\'BusinessTemplate_viewSvnShowFile?file="+f+"\'>"+f+"</a>"\n edit_path = context.getPortalObject()["portal_subversion"].editPath(context, f)\n diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/added_files.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/added_files.xml index e955a935c9f05fa0fdfb20e36a447de2c4f2acf3..39894d469e3093b3d95a9fc5b3654e8d8b9e5951 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/added_files.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/added_files.xml @@ -299,7 +299,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:\'\\n\'.join(here.REQUEST[\'added\'].split(\',\'))</string> </value> + <value> <string>python:\'\\n\'.join(here.added.split(\',\'))</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/modified_files.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/modified_files.xml index 4253577e4edb73aa1021e7e1026449ffa7b05284..bb304aa401720f8bdaea67385ac2a08fd26c4b1a 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/modified_files.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/modified_files.xml @@ -299,7 +299,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:\'\\n\'.join(here.REQUEST[\'modified\'].split(\',\'))</string> </value> + <value> <string>python:\'\\n\'.join(here.modified.split(\',\'))</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/removed_files.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/removed_files.xml index c853eb2f12960bab1f436e2c3ccedb92c4a55708..59a857328c78c151e7a4592c3f34122fc4315f1c 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/removed_files.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/removed_files.xml @@ -299,7 +299,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:\'\\n\'.join(here.REQUEST[\'removed\'].split(\',\'))</string> </value> + <value> <string>python:\'\\n\'.join(here.removed.split(\',\'))</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml index 5665208006bfeb7b78cce7574909f74480b67f08..0b00996009f4854eba53619a529d213e0e5fa2d0 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml @@ -75,11 +75,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n js_list python: [\'js/menuico.js\', \'js/movableMenu.js\', \'js/BusinessTemplate_doCreateJavaScriptDiff\']">\n <tal:block metal:use-macro="here/view_master/macros/master">\n <tal:block metal:fill-slot="main">\n -<!-- Form Hidden : Selected files -->\n -<input type=\'hidden\' name=\'removed\' tal:attributes="value python:context.REQUEST[\'removed\']"/>\n -<input type=\'hidden\' name=\'added\' tal:attributes="value python:context.REQUEST[\'added\']"/>\n -<input type=\'hidden\' name=\'modified\' tal:attributes="value python:context.REQUEST[\'modified\']"/>\n -<!-- End Hidden -->\n <tal:py replace="structure \n here/BusinessTemplate_doSvnDiff">diff here</tal:py>\n \n diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_added.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_added.xml index 60f2c655c39cbb9613919f356f7c464ebd8ba6f3..24abe4e90138b59762242ce693bca6391116835e 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_added.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_added.xml @@ -283,7 +283,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/REQUEST/added | nothing</string> </value> + <value> <string>here/added | nothing</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_auth.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_auth.xml index 37669538978a2a99a0ed731365e7ae0a020e8c86..80f3f7e801ef7471ab618b49265e447d89fb37dd 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_auth.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_auth.xml @@ -283,7 +283,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.realm</string> </value> + <value> <string>here/realm</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_changelog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_changelog.xml index 4b50c20f08ffa5cec3c5c549714aed581a3bed89..d16f207c9eef6d01cf0f2faf6e64636c6e163747 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_changelog.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_changelog.xml @@ -283,7 +283,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/REQUEST/changelog | nothing</string> </value> + <value> <string>here/changelog | nothing</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_modified.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_modified.xml index eafb8d268e5180cadd62af84befba1e9ea339182..2a9dfee7f47600514eb711af1881e760ae7ec1f6 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_modified.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_modified.xml @@ -283,7 +283,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/REQUEST/modified | nothing</string> </value> + <value> <string>here/modified | nothing</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_removed.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_removed.xml index d82bdfe656ae64be09442fb789fd16aa9011e539..ab6250702862298d9dfd9c3fc4329ef9abb04e04 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_removed.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_removed.xml @@ -283,7 +283,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/REQUEST/removed | nothing</string> </value> + <value> <string>here/removed | nothing</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_added.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_added.xml index 60f2c655c39cbb9613919f356f7c464ebd8ba6f3..24abe4e90138b59762242ce693bca6391116835e 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_added.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_added.xml @@ -283,7 +283,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/REQUEST/added | nothing</string> </value> + <value> <string>here/added | nothing</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_changelog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_changelog.xml index f7ab5939b8ea9768fb357da2bf100595d0fee6b0..2ba20fce5132f7bce5ed9c7c3c058d33c5c11f58 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_changelog.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_changelog.xml @@ -283,7 +283,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/REQUEST/changelog | nothing</string> </value> + <value> <string>here/changelog | nothing</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_modified.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_modified.xml index eafb8d268e5180cadd62af84befba1e9ea339182..2a9dfee7f47600514eb711af1881e760ae7ec1f6 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_modified.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_modified.xml @@ -283,7 +283,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/REQUEST/modified | nothing</string> </value> + <value> <string>here/modified | nothing</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_removed.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_removed.xml index d82bdfe656ae64be09442fb789fd16aa9011e539..ab6250702862298d9dfd9c3fc4329ef9abb04e04 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_removed.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_removed.xml @@ -283,7 +283,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/REQUEST/removed | nothing</string> </value> + <value> <string>here/removed | nothing</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_forge/bt/change_log b/bt5/erp5_forge/bt/change_log index 923e383619fa60fd3be3d22ac40d17004f6f061c..07834271f7091dabec36f7556d5e8c6f11b6ec76 100644 --- a/bt5/erp5_forge/bt/change_log +++ b/bt5/erp5_forge/bt/change_log @@ -1,3 +1,6 @@ +2006-07-11 chris +* Now possible to filter files to commit from diff view + 2006-07-05 chris * ERP5Subversion now detects outdated files so that user know if he needs to update his working copy or not. diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision index c5b431b6cba29540b4b284840ff229bce0460886..8783e305111947a209a0689074d8dfa60d33582e 100644 --- a/bt5/erp5_forge/bt/revision +++ b/bt5/erp5_forge/bt/revision @@ -1 +1 @@ -50 \ No newline at end of file +53 \ No newline at end of file diff --git a/bt5/erp5_forge/bt/version b/bt5/erp5_forge/bt/version index fcbb5375b7e1df4bc9b5029b780449c6a1e32ee0..bbde4bee23f26c58aac827c8ca1b38719f9f2729 100644 --- a/bt5/erp5_forge/bt/version +++ b/bt5/erp5_forge/bt/version @@ -1 +1 @@ -0.8.4 \ No newline at end of file +0.8.5 \ No newline at end of file