Merge "Bug fixes in results, tastcases and header file"

4 files changed, 12 insertions, 11 deletions

diff --git a/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCases.html b/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCases.html
index 00dd0f1..ee87e0a 100644
--- a/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCases.html
+++ b/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCases.html
@@ -47,9 +47,9 @@
                     {{testcase.name}}
                 </a>
             </td>
-            <td>{{ ctrl.data.tier}}</td>
-            <td>{{ctrl.data.blocking}}</td>
-            <td>{{ctrl.data.ci_loop}}</td>
+            <td>{{testcase.tier}}</td>
+            <td>{{testcase.blocking}}</td>
+            <td>{{testcase.ci_loop}}</td>
             <td ng-class="{'hidden': ! ((auth.projectNames.length>0) && auth.isAuthenticated)}">
                 <span class="podsTable-col">
                     <a class="text-warning" ng-click="testCasesCtrl.openUpdateTestModal(testcase.name)" title="Edit">
diff --git a/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCasesController.js b/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCasesController.js
index 0045284..6d3c245 100644
--- a/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCasesController.js
+++ b/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCasesController.js
@@ -244,12 +244,13 @@
             {label: 'blocking', type: 'text', required: false},
             {label: 'criteria', type: 'text', required: false},
             {label: 'domains', type: 'text', required: false},
+            {label: 'ci_loop', type: 'text', required: false},
             {label: 'catalog_description', type: 'text', required: false}
         ];
 
         ctrl.testcase = {name : null, description : null,version : null, tier : null, tags : null,
                      run : null, dependencies : null, trust : null, url : null, blocking : null,
-                 criteria : null, domains : null, catalog_description : null};
+                 criteria : null, domains : null, ci_loop: null,  catalog_description : null};
 
         if(ctrl.data.text=="Update"){
             ctrl.testcase = ctrl.data.testCase
diff --git a/testapi/opnfv_testapi/ui/components/projects/projects.html b/testapi/opnfv_testapi/ui/components/projects/projects.html
index 8a27a57..5a3b421 100644
--- a/testapi/opnfv_testapi/ui/components/projects/projects.html
+++ b/testapi/opnfv_testapi/ui/components/projects/projects.html
@@ -2,13 +2,13 @@
 
 <div class="row" style="margin-bottom:24px;"></div>
 <div class="row podsTable" style="vertical-align:middle">
-    <div class="col-sm-1 pull-right" ng-class="{ 'hidden': ! ((auth.projectNames.length>0) &&
-        auth.isAuthenticated) }" >
+    <div class="col-sm-1 pull-right" ng-class="{ 'hidden': !((auth.projectNames.length>0) &&
+        auth.isAuthenticated) && authenticate}" >
             <button type="button" class="btn btn-danger" ng-click="ctrl.openBatchDeleteModal()">
               <i class="fa fa-minus"></i> Delete</button>
     </div>
     <div class="col-sm-1 pull-right"  ng-class="{ 'hidden': ! ((auth.projectNames.length>0) &&
-        auth.isAuthenticated) }">
+        auth.isAuthenticated) && authenticate}">
         <button type="button" class="btn btn-success" ng-click="ctrl.openCreateModal()">
           <i class="fa fa-plus"></i> Create</button>
     </div>
@@ -40,7 +40,7 @@
             <th style="width: 1%;">Bulk Select</th>
             <th style="width: 19%;">Name</th>
             <th style="width: 70%;">Description</th>
-            <th style="width: 10%;" ng-class="{'hidden': ! ((auth.projectNames.length>0) && auth.isAuthenticated)}">Operations</th>
+            <th style="width: 10%;" ng-class="{'hidden': ! ((auth.projectNames.length>0) && auth.isAuthenticated) && authenticate}">Operations</th>
         </tr>
         </thead>
         <tbody>
@@ -52,7 +52,7 @@
             </td>
             <td><a class="text-info" ng-click="ctrl.viewProject(project.name)">{{project.name}}</a></td>
             <td>{{project.description}}</td>
-            <td ng-class="{'hidden': ! ((auth.projectNames.length>0) && auth.isAuthenticated)}">
+            <td ng-class="{'hidden': ! ((auth.projectNames.length>0) && auth.isAuthenticated) && authenticate}">
                 <span class="podsTable-col">
                     <a class="text-warning" ng-click="ctrl.openUpdateModal(project.name)" title="Edit" >
                         <i class="fa fa-pencil-square-o"></i></a>
diff --git a/testapi/opnfv_testapi/ui/components/projects/projectsController.js b/testapi/opnfv_testapi/ui/components/projects/projectsController.js
index 38764ea..bb394c0 100644
--- a/testapi/opnfv_testapi/ui/components/projects/projectsController.js
+++ b/testapi/opnfv_testapi/ui/components/projects/projectsController.js
@@ -21,7 +21,7 @@
 
         ProjectsController.$inject = [
         '$scope', '$http', '$filter', '$state', '$window', '$uibModal', 'testapiApiUrl',
-        'raiseAlert', 'confirmModal'
+        'raiseAlert', 'confirmModal', 'authenticate'
     ];
 
     /**
@@ -30,7 +30,7 @@
      * through projects declared in TestAPI.
      */
     function ProjectsController($scope, $http, $filter, $state, $window, $uibModal, testapiApiUrl,
-        raiseAlert, confirmModal) {
+        raiseAlert, confirmModal, authenticate) {
         var ctrl = this;
         ctrl.url = testapiApiUrl + '/projects';