From b3501de5a645f69c705e64345965aab9cd271355 Mon Sep 17 00:00:00 2001
From: grakiss <grakiss.wanglei@huawei.com>
Date: Wed, 1 Nov 2017 08:00:40 +0000
Subject: Remove approve / no approve options for reviewers

Distinguish results shared or submitted from a tester

JIRA: DOVETAIL-544
JIRA: DOVETAIL-545

[cvp-web]There is consensus within C&C committee to move towards a
simpler means of voting by reviewers. We will use email voting (+1) on
the [cvp@opnfv.org|mailto:cvp@opnfv.org] email alias. For now, can we
disable the approve / not approve options in the drop-down in the
'Operation' column of the results? We can revisit this feature in the
future after some experience with the manual method.

[cvp-web]When a user shares or submits results, the recipient of
those results (share target or reviewer) do not know where the results
originated from. To remedy this issue, we will add a column labeled
'Owner' to the 'My Results' table that shows the email address or the
sending party?

Change-Id: I586b01ad113d898fe3d5824025df9877118fa622
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
---
 cvp/3rd_party/static/testapi-ui/components/results/results.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'cvp')

diff --git a/cvp/3rd_party/static/testapi-ui/components/results/results.html b/cvp/3rd_party/static/testapi-ui/components/results/results.html
index cd38ad75..9127e170 100644
--- a/cvp/3rd_party/static/testapi-ui/components/results/results.html
+++ b/cvp/3rd_party/static/testapi-ui/components/results/results.html
@@ -21,6 +21,7 @@
             <tr>
                 <th>Upload Date</th>
                 <th>Test ID</th>
+                <th>Owner</th>
                 <th>File Name</th>
                 <th>Label</th>
                 <th>Status</th>
@@ -35,6 +36,8 @@
             <tr ng-repeat="(index, result) in ctrl.data.tests">
                 <td>{{ result.upload_date | limitTo:19}}</td>
                 <td><a ng-click="ctrl.gotoResultDetail(result.id, result._id)">{{ result.id }}</a></td>
+                <td><a  uib-tooltip="{{ result.id }}" tooltip-placement="top" tooltip-append-to-body="true" ng-click="ctrl.gotoResultDetail(result.id, result._id)">{{ result.id | limitTo:8 }}</a></td>
+                <td>{{ result.owner }}</td>
                 <td>{{ result.filename || "None"}}</td>
                 <td><div class="popover-wrapper"><a editable-theme="bs3" onbeforesave="ctrl.toggleCheck(result, 'label', $data)" editable-text="result.label"> {{ result.label || "None" }}</a></div></td>
                 <td>{{ result.status }}</td>
@@ -48,8 +51,10 @@
                         <ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="single-button">
                             <li role="menuitem" ng-if="auth.currentUser.role == 'user'" class="menu-item menu-item-type-post_type menu-item-object-page"><a ng-class="{'hide': result.status != 'review'}" ng-click="ctrl.toPrivate(result, 'private')">withdraw submit</a></li>
                             <li role="menuitem" ng-if="auth.currentUser.role == 'user'" class="menu-item menu-item-type-post_type menu-item-object-page"><a ng-class="{'hide': result.status != 'private'}" ng-click="ctrl.toReview(result, 'review')">submit to review</a></li>
+                            <!--
                             <li role="menuitem" ng-if="auth.currentUser.role.indexOf('reviewer') != -1" class="menu-item menu-item-type-post_type menu-item-object-page"><a ng-class="{'hide': result.status == 'approved'}" ng-click="ctrl.toggleCheck(result, 'status', 'approve')">approve</a></li>
                             <li role="menuitem" ng-if="auth.currentUser.role.indexOf('reviewer') != -1" class="menu-item menu-item-type-post_type menu-item-object-page"><a ng-class="{'hide': result.status == 'not approved'}" ng-click="ctrl.toggleCheck(result, 'status', 'not approve')">not approve</a></li>
+                            -->
                             <li role="menuitem" class="menu-item menu-item-type-post_type menu-item-object-page"><a ng-click="ctrl.openSharedModal(result)">share with</a></li>
                             <li role="menuitem" ng-if="auth.currentUser.openid == result.owner" class="menu-item menu-item-type-post_type menu-item-object-page"><a ng-click="ctrl.deleteTest(result._id)">delete</a></li>
                         </ul>
@@ -95,3 +100,4 @@
 .button-disabled {
     pointer-events:none;
 }
+</style>
-- 
cgit 1.2.3-korg