From 4d6ce4b5fa5847921fa2ca6d7665f6290ba25851 Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chouse@ansible.com>
Date: Tue, 1 Apr 2014 18:30:04 -0400
Subject: [PATCH] Fixed Type and Name columns in Scheduled list on Jobs page.
 Fixed Name link in completed jobs list on Jobs page.

---
 awx/ui/static/js/helpers/Jobs.js        | 5 +++--
 awx/ui/static/js/helpers/Schedules.js   | 2 ++
 awx/ui/static/js/lists/ScheduledJobs.js | 8 ++++++--
 awx/ui/static/less/ansible-ui.less      | 7 +++++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/awx/ui/static/js/helpers/Jobs.js b/awx/ui/static/js/helpers/Jobs.js
index 059a39aea8..5c03c22499 100644
--- a/awx/ui/static/js/helpers/Jobs.js
+++ b/awx/ui/static/js/helpers/Jobs.js
@@ -73,7 +73,8 @@ angular.module('JobsHelper', ['Utilities', 'RestServices', 'FormGenerator', 'Job
             scope.viewJobLog = function(id, url) {
                 var list, job;
                 if (url) {
-                    $location.path(url);
+                    console.log(url);
+                    $location.url(url);
                 }
                 else {
                     if (scope.completed_jobs) {
@@ -303,7 +304,7 @@ angular.module('JobsHelper', ['Utilities', 'RestServices', 'FormGenerator', 'Job
                 Rest.setUrl(item.related.inventory_source);
                 Rest.get()
                     .success(function(data) {
-                        itm.nameHref = "/inventories/" + data.inventory;
+                        itm.nameHref = "/home/groups?id=" + data.group;
                     });
             }
             else if (item.type === "project_update") {
diff --git a/awx/ui/static/js/helpers/Schedules.js b/awx/ui/static/js/helpers/Schedules.js
index 18a7cf429c..d4f56ff501 100644
--- a/awx/ui/static/js/helpers/Schedules.js
+++ b/awx/ui/static/js/helpers/Schedules.js
@@ -503,6 +503,8 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe
                         itm.status_tip = 'Schedule is temporarily stopped. Click to activate.';
                     }
 
+                    itm.nameTip = item.name + " schedule. Click to edit.";
+
                     // Copy summary_field values
                     for (field in list.fields) {
                         fld = list.fields[field];
diff --git a/awx/ui/static/js/lists/ScheduledJobs.js b/awx/ui/static/js/lists/ScheduledJobs.js
index febc160f84..e639421c08 100644
--- a/awx/ui/static/js/lists/ScheduledJobs.js
+++ b/awx/ui/static/js/lists/ScheduledJobs.js
@@ -45,7 +45,7 @@ angular.module('ScheduledJobsDefinition', [])
                 link: false,
                 columnClass: "col-md-2 hidden-sm hidden-xs",
                 sourceModel: 'unified_job_template',
-                sourceField: 'type',
+                sourceField: 'job_type',
                 ngBind: 'schedule.type_label',
                 searchable: false,
                 nosort: true
@@ -53,7 +53,11 @@ angular.module('ScheduledJobsDefinition', [])
             name: {
                 label: 'Name',
                 columnClass: "col-md-3 col-xs-5",
-                ngClick: "editSchedule(schedule.id)"
+                sourceModel: 'unified_job_template',
+                sourceField: 'name',
+                ngClick: "editSchedule(schedule.id)",
+                awToolTip: "{{ schedule.nameTip }}",
+                dataPlacement: "top"
             }
         },
 
diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less
index 669494739a..f45e06fdef 100644
--- a/awx/ui/static/less/ansible-ui.less
+++ b/awx/ui/static/less/ansible-ui.less
@@ -1055,12 +1055,15 @@ input[type="checkbox"].checkbox-no-label {
           color: #666;
       }
       .pagination li a {
-          font-size: 12px;
+          font-size: 13px;
       }
       i[class*="icon-job-"] {
-          font-size: 12.5px;
+          font-size: 13px;
       }
   }
+  #completed_jobs_table i[class*="icon-job-"] {
+      font-size: 13px;
+  }
   
 /* Inventory job status badge */
   .failures-true {