Skip to content

erp5
erp5
Commit 9510f936 authored by Roque's avatar Roque Committed by Roque
Browse files
Options

erp5_web_project_ui: fixes on naming convention and listbox selection names

parent 2fbff7df
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_getRelatedObjectList.xml
View file @ 9510f936
......@@ -50,7 +50,7 @@
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>portal_type= [], limit=None, **kw</string> </value>
<value> <string>portal_type= (), limit=None, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
......
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_viewActivityList/listbox.xml
View file @ 9510f936
......@@ -307,7 +307,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>base_view_document_selection</string> </value>
<value> <string>base_view_project_activity_selection</string> </value>
</item>
<item>
<key> <string>target</string> </key>
......
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_viewDocumentList/listbox.xml
View file @ 9510f936
......@@ -258,7 +258,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>project_view_document_selection</string> </value>
<value> <string>base_view_project_document_selection</string> </value>
</item>
<item>
<key> <string>target</string> </key>
......
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_viewMilestoneList/listbox.xml
View file @ 9510f936
......@@ -229,7 +229,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>project_milestone_selection</string> </value>
<value> <string>project_milestone_list_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/gadget_project_info.html.html
View file @ 9510f936
......@@ -17,12 +17,12 @@
<a id="activity_link" class="first-line-buttons ui-disabled" data-i18n="[value]Activities" disabled >Activities</a>
<a id="milestone_link" class="first-line-buttons ui-disabled" data-i18n="[value]Milestones" disabled >Milestones</a>
<a id="document_link" class="first-line-buttons ui-disabled" data-i18n="[value]Documents" disabled >Documents</a>
<a id="support_request_link" class="first-line-buttons ui-disabled" data-i18n="[value]Support Requests" disabled >Support requests</a>
<a id="task_link" class="first-line-buttons ui-disabled" data-i18n="[value]Confirmed Tasks" disabled >Confirmed Tasks</a>
<a id="support_request_link" class="first-line-buttons ui-disabled" data-i18n="[value]Support Requests" disabled >Support Requests</a>
<a id="task_link" class="first-line-buttons ui-disabled" data-i18n="[value]Confirmed Tasks" disabled >Ongoing Tasks</a>
<a id="report_link" class="first-line-buttons ui-disabled" data-i18n="[value]Task Reports" disabled >Opened Task Reports</a>
<a id="bug_link" class="first-line-buttons ui-disabled" data-i18n="[value]Bugs" disabled >Opened Bugs</a>
<a id="test_suite_link" class="first-line-buttons ui-disabled" data-i18n="[value]Test suite" disabled >Test suite</a>
<a id="test_result_link" class="first-line-buttons ui-disabled" data-i18n="[value]Last test result" disabled >Last test result</a>
<a id="test_suite_link" class="first-line-buttons ui-disabled" data-i18n="[value]Test suite" disabled >Test Suite</a>
<a id="test_result_link" class="first-line-buttons ui-disabled" data-i18n="[value]Latest Test Result" disabled >Latest Test Result</a>
<svg id="test_result_svg" class="test-result ui-hidden" width="14" height="14" viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg"><g fill-rule="evenodd"><path d="M0 7a7 7 0 1 1 14 0A7 7 0 0 1 0 7z"></path><path d="M13 7A6 6 0 1 0 1 7a6 6 0 0 0 12 0z" fill="#FFF"></path><path id="test_result_fail" class="ui-hidden" d="M7 5.969L5.599 4.568a.29.29 0 0 0-.413.004l-.614.614a.294.294 0 0 0-.004.413L5.968 7l-1.4 1.401a.29.29 0 0 0 .004.413l.614.614c.113.114.3.117.413.004L7 8.032l1.401 1.4a.29.29 0 0 0 .413-.004l.614-.614a.294.294 0 0 0 .004-.413L8.032 7l1.4-1.401a.29.29 0 0 0-.004-.413l-.614-.614a.294.294 0 0 0-.413-.004L7 5.968z"></path><path id="test_result_pass" class="ui-hidden" d="M6.278 7.697L5.045 6.464a.296.296 0 0 0-.42-.002l-.613.614a.298.298 0 0 0 .002.42l1.91 1.909a.5.5 0 0 0 .703.005l.265-.265L9.997 6.04a.291.291 0 0 0-.009-.408l-.614-.614a.29.29 0 0 0-.408-.009L6.278 7.697z"></path><path id="test_result_running" class="ui-hidden" d="M7 3c2.2 0 4 1.8 4 4s-1.8 4-4 4c-1.3 0-2.5-.7-3.3-1.7L7 7V3"></path></g></svg>
<a id="web_page_link" class="first-line-buttons ui-disabled" data-i18n="[value]Edit Project Page" disabled >Edit Project Page</a>
</p>
......
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/gadget_project_info.js.js
View file @ 9510f936
......@@ -33,7 +33,7 @@
return view_list.filter(d => d.name === name)[0].href;
}
function setLastTestResult(gadget, project_title, svg_element) {
function setLatestTestResult(gadget, project_title, svg_element) {
var query = createProjectQuery(project_title,
[["portal_type", "Test Result"]]);
return gadget.jio_allDocs({
......@@ -230,11 +230,11 @@
getUrlParameterDict('bug_module', "view", [["delivery.start_date", "descending"]],
["title", "description", "source_person_title", "destination_person_title", "delivery.start_date"],
createProjectQuery(modification_dict.project_title,
[["selection_domain_state_bug_domain", "started"]])),
[["selection_domain_state_bug_domain", "open"]])),
getUrlParameterDict('task_report_module', 'view', [["delivery.start_date", "descending"]],
["title", "delivery.start_date", "source_title"],
createProjectQuery(modification_dict.project_title,
[["selection_domain_state_task_report_domain", "started"]])),
[["selection_domain_state_task_report_domain", "confirmed"]])),
getUrlParameterDict('test_result_module', 'view', [["delivery.start_date", "descending"]],
null, createProjectQuery(modification_dict.project_title, [])),
getUrlParameterDict('test_suite_module', 'view', [["creation_date", "descending"]],
......@@ -258,7 +258,7 @@
}
enableLink(document.getElementById("document_link"), url_list[8]);
enableLink(document.getElementById("activity_link"), url_list[9]);
setLastTestResult(gadget, modification_dict.project_title,
setLatestTestResult(gadget, modification_dict.project_title,
document.getElementById("test_result_svg"));
});
})
......
bt5/erp5_web_project_ui_test/PathTemplateItem/portal_tests/project_ui_zuite/testRenderjsBasicNavigation.zpt
View file @ 9510f936
......@@ -131,7 +131,7 @@
<tr>
<td>assertElementPresent</td>
<td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Support requests']</td>
<td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Support Requests']</td>
<td></td>
</tr>
......@@ -155,7 +155,7 @@
<tr>
<td>assertElementPresent</td>
<td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Confirmed Tasks']</td>
<td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Ongoing Tasks']</td>
<td></td>
</tr>
......@@ -167,13 +167,13 @@
<tr>
<td>assertElementPresent</td>
<td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Last test result']</td>
<td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Latest Test Result']</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Test suite']</td>
<td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Test Suite']</td>
<td></td>
</tr>
......
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