Skip to content

erp5
erp5
Commit e4bd6f19 authored by Christophe Dumez's avatar Christophe Dumez
Browse files
Options

2006-07-11 chris 

* Now possible to filter files to commit from diff view

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8411 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 41d11e38
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 20 deletions
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
View file @ e4bd6f19
......@@ -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>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml
View file @ e4bd6f19
......@@ -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
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/added_files.xml
View file @ e4bd6f19
......@@ -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>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/modified_files.xml
View file @ e4bd6f19
......@@ -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>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog/removed_files.xml
View file @ e4bd6f19
......@@ -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>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml
View file @ e4bd6f19
......@@ -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
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_added.xml
View file @ e4bd6f19
......@@ -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>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_auth.xml
View file @ e4bd6f19
......@@ -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>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_changelog.xml
View file @ e4bd6f19
......@@ -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>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_modified.xml
View file @ e4bd6f19
......@@ -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>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin/your_removed.xml
View file @ e4bd6f19
......@@ -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>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_added.xml
View file @ e4bd6f19
......@@ -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>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_changelog.xml
View file @ e4bd6f19
......@@ -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>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_modified.xml
View file @ e4bd6f19
......@@ -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>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust/your_removed.xml
View file @ e4bd6f19
......@@ -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>
......
bt5/erp5_forge/bt/change_log
View file @ e4bd6f19
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.
......
bt5/erp5_forge/bt/revision
View file @ e4bd6f19
50
\ No newline at end of file
53
\ No newline at end of file
bt5/erp5_forge/bt/version
View file @ e4bd6f19
0.8.4
\ No newline at end of file
0.8.5
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7