From 1ecc7dcf4fc154b853a493e44abab59ff311255b Mon Sep 17 00:00:00 2001 From: Christophe Dumez <christophe@nexedi.com> Date: Wed, 12 Apr 2006 13:48:58 +0000 Subject: [PATCH] fixed svn info git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6557 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../BusinessTemplate_viewSvnInfosFile.xml | 4 ++-- .../BusinessTemplate_viewSvnLog/listbox.xml | 19 ++++++++++++++++++- .../portal_skins/erp5_svn/svn_ls.xml | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml index 0417ba49af..1ce9291f42 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml @@ -56,11 +56,11 @@ <tal:block metal:fill-slot="main">\n \n <tal:block tal:define="path context/file;\n - infos_list context/infos_list">\n + infos_dict context/infos_dict">\n <font color=\'black\'>\n <br><a tal:attributes="href python:\'BusinessTemplate_viewSvnShowFile?file=\'+str(path)"><b tal:content="path"></b></a>\n <a tal:attributes="href context/edit_path"><img src=\'imgs/edit.png\' border=\'0\'></a><hr><br>\n - <table width=60%% border=1 tal:repeat="infos_dict infos_list">\n + <table width=60%% border=1>\n <tr height="18px"><td style=\'background-color: rgb(204, 204, 255);\'><b>Name</b></td><td style=\'background-color: white;\' tal:content="python:path.split(\'/\')[-1]">filename</td></tr>\n <tr height="18px"><td style=\'background-color: rgb(204, 204, 255);\'><b>Size</b></td><td style=\'background-color: white;\' tal:content="python:infos_dict[\'size\']/1024.">filesize</td></tr>\n <tr height="18px"><td style=\'background-color: rgb(204, 204, 255);\'><b>Type</b></td><td style=\'background-color: white;\' tal:content="python:infos_dict[\'kind\']">filekind</td></tr>\n diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml index f45993b13d..be509445b4 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml @@ -464,7 +464,24 @@ <item> <key> <string>search_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>revision</string> + <string>Revision</string> + </tuple> + <tuple> + <string>author</string> + <string>Author</string> + </tuple> + <tuple> + <string>date</string> + <string>Date</string> + </tuple> + <tuple> + <string>message</string> + <string>Changelog</string> + </tuple> + </list> </value> </item> <item> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_ls.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_ls.xml index 6d660f4548..1b873a7a97 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_ls.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_ls.xml @@ -83,7 +83,7 @@ except SubversionLoginError, error1 :\n context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n return context.asContext(caller=\'ls\', realm = error1.getRealm(), username = context.getPortalObject().portal_preferences.getPreference(\'preferred_subversion_user_name\')).BusinessTemplate_viewSvnLogin()\n \n -return context.asContext(infos_list=infos_list, file=file, edit_path=context.getPortalObject()["portal_subversion"].editPath(context, file)).BusinessTemplate_viewSvnInfosFile()\n +return context.asContext(infos_dict=infos_list[0], file=file, edit_path=context.getPortalObject()["portal_subversion"].editPath(context, file)).BusinessTemplate_viewSvnInfosFile()\n </string> </value> </item> <item> -- 2.30.9