erp5_web_project_ui: custom links parameters

bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_getQuickViewUrl.py

@@ -15,5 +15,5 @@ if url_dict:
     }
   }
 
-elif url_dict:
+else:
   return {}

bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/gadget_project_info.html.html

@@ -22,6 +22,11 @@
       </div>
     </div>
     <div class="ui-field-contain" style="top:100px;">
+      <p>
+        <a id="milestone_link" class="first-line-buttons ui-disabled" data-i18n="[value]Milestones" disabled >Milestones</a>
+      </p>
+    </div>
+    <div class="ui-field-contain" style="top:150px;">
       <p>
         <a id="task_link" class="first-line-buttons ui-disabled" data-i18n="[value]Tasks" disabled >Tasks:</a>
         <span id="task_count">...</span><span> opened / </span>
@@ -31,14 +36,14 @@
         <span id="closed_report_count">...</span><span> recently closed </span>
       </p>
     </div>
-    <div class="ui-field-contain" style="top:150px;">
+    <div class="ui-field-contain" style="top:200px;">
       <p>
         <a id="bug_link" class="first-line-buttons ui-disabled" data-i18n="[value]Bugs" disabled >Bugs:</a>
         <span id="bug_count">...</span><span> opened </span>
         <span id="closed_bug_count">...</span><span> recently closed </span>
       </p>
     </div>
-    <div class="ui-field-contain" style="top:200px;">
+    <div class="ui-field-contain" style="top:250px;">
       <p>
         <a id="test_result_link" class="first-line-buttons ui-disabled" data-i18n="[value]Last test result" disabled >Last test result:</a>
         <span id="last_test_result" style="margin-right:50px;">...</span>

bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/gadget_project_info.js.js

@@ -70,7 +70,7 @@ lockGadgetInQueue, unlockGadgetInQueue, unlockGadgetInFailedQueue*/
 
       return gadget.jio_getAttachment(modification_dict.jio_key, "links")
         .push(function (erp5_document) {
-          var view_list = ensureArray(erp5_document._links.view), i,
+          var view_list = ensureArray(erp5_document._links.view),
             task_view = view_list.filter(d => d.name === "task_list")[0].href,
             bug_view = view_list.filter(d => d.name === "bug_list")[0].href,
             milestone_view = view_list.filter(d => d.name === "milestone")[0].href,
@@ -81,36 +81,36 @@ lockGadgetInQueue, unlockGadgetInQueue, unlockGadgetInFailedQueue*/
           enableLink(document.getElementById("forum_link"), modification_dict.forum_link);
           enableLink(document.getElementById("description_link"), modification_dict.description_link);
 
-          generateLink(gadget, document.getElementById("bug_link"), 'display_with_history', {
-            'jio_key': 'bug_module',
-            'page': 'form',
-            'view': bug_view,
+          generateLink(gadget, document.getElementById("milestone_link"), 'display_with_history', {
+            'jio_key': 'milestone_module', 'page': 'form', 'view': milestone_view,
+            'field_listbox_sort_list:json': [["stop_date", "ascending"]]
+          }, {});
+
+          generateLink(gadget, document.getElementById("bug_link"), 'display', {
+            'jio_key': 'bug_module', 'page': 'form', 'view': bug_view,
             'field_listbox_sort_list:json': [["start_date", "descending"]],
             'field_listbox_column_list:json': ["title", "description", "start_date"],
-            //TODO: this should use a domain tree
-            'extended_search': 'translated_simulation_state_title:  "Open"'
+            'extended_search': ('source_project_title:  "' + modification_dict.project_title + '" AND selection_domain_state_bug_domain:  "started"')
           });
           generateInfo(gadget, document.getElementById("bug_count"), project_url + "/Project_bugs");
           generateInfo(gadget, document.getElementById("closed_bug_count"), project_url + "/Project_bugs?closed=1");
 
           generateLink(gadget, document.getElementById("task_link"), 'display_with_history', {
-            'jio_key': 'task_module',
-            'page': 'form',
-            'view': task_view,
+            'jio_key': 'task_module', 'page': 'form', 'view': 'view',
             'field_listbox_sort_list:json': [["delivery.start_date", "descending"]],
-            //TODO: this should use a domain tree
-            'extended_search': 'translated_simulation_state_title:  "Open"'
+            'field_listbox_column_list:json': ["title", "delivery.start_date", "delivery.stop_date", "destination_decision_title",
+                                               "source_title", "destination_title", "total_quantity", "task_line_quantity_unit_title"],
+            'extended_search': ('source_project_title:  "' + modification_dict.project_title + '" AND selection_domain_state_task_domain:  "started"')
           });
           generateInfo(gadget, document.getElementById("task_count"), project_url + "/Project_tasks");
           generateInfo(gadget, document.getElementById("unassigned_task_count"), project_url + "/Project_tasksToAssigne");
 
           generateLink(gadget, document.getElementById("report_link"), 'display_with_history', {
-            'jio_key': 'task_report_module',
-            'page': 'form',
-            'view': task_report_view,
-            'field_listbox_sort_list:json': [["delivery.start_date", "descending"]]
-            //TODO: this should use a domain tree
-            //'extended_search': 'translated_simulation_state_title:  "Open"'
+            'jio_key': 'task_report_module', 'page': 'form', 'view': 'view',
+            'field_listbox_sort_list:json': [["delivery.start_date", "descending"]],
+            'field_listbox_column_list:json': ["title", "delivery.start_date", "delivery.stop_date", "destination_decision_title",
+                                               "source_title", "destination_title", "total_quantity", "task_line_quantity_unit_title"],
+            'extended_search': ('source_project_title:  "' + modification_dict.project_title + '" AND selection_domain_state_task_report_domain:  "started"')
           });
           generateInfo(gadget, document.getElementById("report_count"), project_url + "/Project_taskReports");
           generateInfo(gadget, document.getElementById("closed_report_count"), project_url + "/Project_taskReports?closed=1");
@@ -119,7 +119,8 @@ lockGadgetInQueue, unlockGadgetInQueue, unlockGadgetInFailedQueue*/
             'jio_key': 'test_result_module',
             'page': 'form',
             'view': 'view',
-            'field_listbox_sort_list:json': [["delivery.start_date", "descending"]]
+            'field_listbox_sort_list:json': [["delivery.start_date", "descending"]],
+            'extended_search': ('source_project_title:  "' + modification_dict.project_title + '"')
           });
           generateInfo(gadget, document.getElementById("last_test_result"), project_url + "/Project_lastTestResult");
 
@@ -127,7 +128,8 @@ lockGadgetInQueue, unlockGadgetInQueue, unlockGadgetInFailedQueue*/
             'jio_key': 'test_suite_module',
             'page': 'form',
             'view': 'view',
-            'field_listbox_sort_list:json': [["delivery.start_date", "descending"]]
+            'field_listbox_sort_list:json': [["creation_date", "descending"]],
+            'extended_search': ('source_project_title:  "' + modification_dict.project_title + '"')
           });
 
         });