Skip to content

erp5
erp5
Commit 178df6cb authored by Jean-Paul Smets's avatar Jean-Paul Smets
Browse files
Options

Updated forms. New naming for admin toolbox field (prevent conflicts) 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12411 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2ee6eebe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 559 additions and 44 deletions
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewContentList/listbox.xml
View file @ 178df6cb
......@@ -440,6 +440,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -512,28 +516,7 @@
<item>
<key> <string>url_columns</string> </key>
<value>
<list>
<tuple>
<string>id</string>
<string>WebSite_getListboxUrl</string>
</tuple>
<tuple>
<string>title</string>
<string>WebSite_getListboxUrl</string>
</tuple>
<tuple>
<string>portal_type</string>
<string>WebSite_getListboxUrl</string>
</tuple>
<tuple>
<string>creation_date</string>
<string>WebSite_getListboxUrl</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>WebSite_getListboxUrl</string>
</tuple>
</list>
<list/>
</value>
</item>
</dictionary>
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewSendByEmailDialog.xml
View file @ 178df6cb
......@@ -74,25 +74,25 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>center</string> </key>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left</string> </key>
<key> <string>left</string> </key>
<value>
<list>
<string>your_email_title</string>
......@@ -103,7 +103,7 @@
</value>
</item>
<item>
<key> <string>right</string> </key>
<key> <string>right</string> </key>
<value>
<list/>
</value>
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValueList.xml
View file @ 178df6cb
......@@ -124,8 +124,8 @@ current_section = context.getWebSectionValue()\n
if not kw.has_key(\'validation_state\'):\n
kw[\'validation_state\'] = [\'draft\', \'submitted\', \'shared\',\n
\'released\', \'published\', \'restricted\']\n
if not kw.has_key(\'order_by\'):\n
kw[\'order_by\'] = [(\'int_index\', \'descending\')]\n
if not kw.has_key(\'sort_on\'):\n
kw[\'sort_on\'] = [(\'int_index\', \'descending\')]\n
if not kw.has_key(\'group_by\'):\n
kw[\'group_by\'] = (\'reference\',)\n
\n
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_cloneContent.xml
View file @ 178df6cb
......@@ -85,12 +85,12 @@ form_data = context.REQUEST.form\n
\n
# Define a list of field name to take into account in the cloning process\n
ACCEPTABLE_FORM_ID_LIST = [ \\\n
\'reference\'\n
, \'language\'\n
, \'version\'\n
, \'revision\'\n
, \'title\'\n
, \'short_title\'\n
\'clone_reference\'\n
, \'clone_language\'\n
, \'clone_version\'\n
, \'clone_revision\'\n
, \'clone_title\'\n
, \'clone_short_title\'\n
]\n
\n
# First make sure that no document already exists with the\n
......@@ -98,13 +98,13 @@ ACCEPTABLE_FORM_ID_LIST = [ \\\n
if clone:\n
portal_type = context.getPortalType()\n
else:\n
portal_type = form_data[\'new_portal_type\']\n
portal_type = form_data[\'clone_portal_type\']\n
\n
# prepare query params\n
kw = {\'portal_type\' : portal_type}\n
if form_data.get(\'reference\'): kw[\'reference\'] = form_data[\'reference\']\n
if form_data.get(\'version\'): kw[\'version\'] = form_data[\'version\']\n
if form_data.get(\'language\'): kw[\'language\'] = form_data[\'language\']\n
if form_data.get(\'clone_reference\'): kw[\'reference\'] = form_data[\'clone_reference\']\n
if form_data.get(\'clone_version\'): kw[\'version\'] = form_data[\'clone_version\']\n
if form_data.get(\'clone_language\'): kw[\'language\'] = form_data[\'clone_language\']\n
\n
# Count documents of same reference and prepare kw\n
count = int(context.portal_catalog.countResults(**kw)[0][0])\n
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml
View file @ 178df6cb
......@@ -113,32 +113,32 @@
\n
<div class="field">\n
<label>Title</label>\n
<div class="input"><input class="input" size="15" type="text" name="title"\n
<div class="input"><input class="input" size="15" type="text" name="clone_title"\n
tal:attributes="value here/getTitle | nothing"/></div>\n
</div>\n
\n
<div class="field">\n
<label>Reference</label>\n
<div class="input"><input class="input" size="15" type="text" name="reference"\n
<div class="input"><input class="input" size="15" type="text" name="clone_reference"\n
tal:attributes="value here/getReference | nothing"/></div>\n
</div>\n
\n
<div class="field">\n
<label>Version</label>\n
<div class="input"><input class="input" size="5" type="text" name="version"\n
<div class="input"><input class="input" size="5" type="text" name="clone_version"\n
tal:attributes="value here/getVersion | nothing"/></div>\n
</div>\n
\n
<div class="field">\n
<label>Language</label>\n
<div class="input"><input class="input" size="5" type="text" name="language"\n
<div class="input"><input class="input" size="5" type="text" name="clone_language"\n
tal:attributes="value here/getLanguage | nothing"/></div>\n
</div>\n
\n
<div class="field hiddenLabel">\n
<label>Type</label>\n
<div class="input">\n
<select class="input" name="new_portal_type" size="1" onchange="setCreationMode(this)">\n
<select class="input" name="clone_portal_type" size="1" onchange="setCreationMode(this)">\n
<option value="None" selected>&mdash; Same as Current &mdash;</option>\n
<tal:block tal:repeat="portal_type python: here.getPortalWebDocumentTypeList()">\n
<option tal:content="portal_type"\n
......
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