From 21fca370689c1f3b6f121391b15463688fd76ca8 Mon Sep 17 00:00:00 2001
From: srikanthv02 <srikanthv02@gmail.com>
Date: Wed, 8 Feb 2017 15:53:17 +0530
Subject: [PATCH 1/2] Runlist format changed and jenkins url path

---
 .../sections/dashboard/bots/controller/botHistoryCtrl.js    | 6 +++---
 .../src/partials/sections/dashboard/bots/view/botInfo.html  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js
index fd0f047e9..792f7e15f 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js
@@ -20,7 +20,7 @@
                 items = $scope.templateSelected;
             } 
         
-            $scope.botHistory = items;
+            $scope.botDetail = items;
             $scope.botId = items.botId;
             
             var botHistoryGrid = uiGridOptionsService.options();
@@ -95,8 +95,8 @@
                                         bpcolumnDefs = chefGrid;
                                     } else if(auditType === 'jenkins') {
                                         var jenkinsGrid = [
-                                            { name:'Job Number',field:'auditTrailConfig.jenkinsBuildNumber',cellTemplate:'<a target="_blank" title="Jenkins" ng-href="{{grid.appScope.bot.botConfig.jobURL}}/{{row.entity.auditTrailConfig.jenkinsBuildNumber}}">{{row.entity.auditTrailConfig.jenkinsBuildNumber}}</a>', sort:{ direction: 'desc'}, cellTooltip: true},
-                                            { name:'Job Output',cellTemplate:'<span><a target="_blank" title="{{jobResultUrlName}}" class="fa fa-file-text bigger-120 btn cat-btn-update btn-sg tableactionbutton marginbottomright3" ng-repeat="jobResultUrlName in row.entity.auditTrailConfig.jobResultURL" ng-href="{{jobResultUrlName}}"></a></span>',cellTooltip: true},
+                                            { name:'Job Number',field:'auditTrailConfig.jenkinsBuildNumber',cellTemplate:'<a target="_blank" title="Jenkins" ng-href="{{grid.appScope.botDetail.botConfig.jobURL}}/{{row.entity.auditTrailConfig.jenkinsBuildNumber}}">{{row.entity.auditTrailConfig.jenkinsBuildNumber}}</a>', sort:{ direction: 'desc'}, cellTooltip: true},
+                                            { name:'Job Output',width: 100,cellTemplate:'<span><a target="_blank" title="{{jobResultUrlName}}" class="fa fa-file-text bigger-120 btn cat-btn-update btn-sg tableactionbutton marginbottomright3" ng-repeat="jobResultUrlName in row.entity.auditTrailConfig.jobResultURL" ng-href="{{jobResultUrlName}}"></a></span>',cellTooltip: true},
                                             { name:'Log Info',width: 90,cellTemplate:'<span title="Jenkins Log" class="fa fa-list bigger-120 btn cat-btn-update btn-sg tableactionbutton" ng-click="grid.appScope.historyLogs(row.entity);"></span>',cellTooltip: true},
                                             { name:'Status',field:'status',cellTemplate:'<div class="{{row.entity.status.toUpperCase()}}">{{row.entity.status.toUpperCase()}}</div>'},
                                             { name:'Start Time',field:'startedOn',cellTemplate:'<span title="{{row.entity.startedOn  | timestampToLocaleTime}}">{{row.entity.startedOn  | timestampToLocaleTime}}</span>',cellTooltip: true},
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html
index 9fd4a1ee3..bf26197c9 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html
@@ -109,7 +109,7 @@ <h4 class="modal-title">
 						<tr>
 							<td class="td-padding">Runlist</td>
 							<td>
-								{{botInfo.botConfig.runlist}}
+								{{botInfo.botConfig.runlist.join(", ")}}
 							</td>
 						</tr>
 						<tr ng-show="botInfo.botConfig && botInfo.botConfig.attributes && botInfo.botConfig.attributes.length > 1" ng-repeat="attribs in botInfo.botConfig.attributes">

From d00108d163e3ee5d6d8df6c8fe314769744e5a07 Mon Sep 17 00:00:00 2001
From: srikanthv02 <srikanthv02@gmail.com>
Date: Wed, 8 Feb 2017 15:56:03 +0530
Subject: [PATCH 2/2] Removed width

---
 .../sections/dashboard/bots/controller/botHistoryCtrl.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js
index 792f7e15f..d927b9d15 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js
@@ -96,7 +96,7 @@
                                     } else if(auditType === 'jenkins') {
                                         var jenkinsGrid = [
                                             { name:'Job Number',field:'auditTrailConfig.jenkinsBuildNumber',cellTemplate:'<a target="_blank" title="Jenkins" ng-href="{{grid.appScope.botDetail.botConfig.jobURL}}/{{row.entity.auditTrailConfig.jenkinsBuildNumber}}">{{row.entity.auditTrailConfig.jenkinsBuildNumber}}</a>', sort:{ direction: 'desc'}, cellTooltip: true},
-                                            { name:'Job Output',width: 100,cellTemplate:'<span><a target="_blank" title="{{jobResultUrlName}}" class="fa fa-file-text bigger-120 btn cat-btn-update btn-sg tableactionbutton marginbottomright3" ng-repeat="jobResultUrlName in row.entity.auditTrailConfig.jobResultURL" ng-href="{{jobResultUrlName}}"></a></span>',cellTooltip: true},
+                                            { name:'Job Output',cellTemplate:'<span><a target="_blank" title="{{jobResultUrlName}}" class="fa fa-file-text bigger-120 btn cat-btn-update btn-sg tableactionbutton marginbottomright3" ng-repeat="jobResultUrlName in row.entity.auditTrailConfig.jobResultURL" ng-href="{{jobResultUrlName}}"></a></span>',cellTooltip: true},
                                             { name:'Log Info',width: 90,cellTemplate:'<span title="Jenkins Log" class="fa fa-list bigger-120 btn cat-btn-update btn-sg tableactionbutton" ng-click="grid.appScope.historyLogs(row.entity);"></span>',cellTooltip: true},
                                             { name:'Status',field:'status',cellTemplate:'<div class="{{row.entity.status.toUpperCase()}}">{{row.entity.status.toUpperCase()}}</div>'},
                                             { name:'Start Time',field:'startedOn',cellTemplate:'<span title="{{row.entity.startedOn  | timestampToLocaleTime}}">{{row.entity.startedOn  | timestampToLocaleTime}}</span>',cellTooltip: true},