From d6dc1140835ce4d08edb01ec11229c72657223a7 Mon Sep 17 00:00:00 2001
From: Calvin Pomerantz <cpomerantz@hubspot.com>
Date: Tue, 3 May 2016 14:42:35 -0400
Subject: [PATCH 1/5] Blow away change user link, which called the nonexistent
 function app.deployUserPrompt()

---
 SingularityUI/app/templates/dashboard.hbs | 2 +-
 SingularityUI/app/views/dashboard.coffee  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/SingularityUI/app/templates/dashboard.hbs b/SingularityUI/app/templates/dashboard.hbs
index a1d21a0db8..f73e5a0567 100644
--- a/SingularityUI/app/templates/dashboard.hbs
+++ b/SingularityUI/app/templates/dashboard.hbs
@@ -1,6 +1,6 @@
 <header>
     {{#if deployUser}}
-        <h1>{{ deployUser }} <small><a data-action="change-user">change</a></small></h1>
+        <h1>{{ deployUser }}</h1>
     {{else}}
         <h1>Singularity</h1>
     {{/if}}
diff --git a/SingularityUI/app/views/dashboard.coffee b/SingularityUI/app/views/dashboard.coffee
index 3cff838329..96482ccde8 100644
--- a/SingularityUI/app/views/dashboard.coffee
+++ b/SingularityUI/app/views/dashboard.coffee
@@ -9,7 +9,6 @@ class DashboardView extends View
     events: ->
         _.extend super,
             'click [data-action="unstar"]': 'unstar'
-            'click [data-action="change-user"]': 'changeUser'
             'click th[data-sort-attribute]': 'sortTable'
             'click [data-action="viewJSON"]': 'viewJson'
             'click [data-action="remove"]': 'removeRequest'
@@ -119,9 +118,6 @@ class DashboardView extends View
         if @$('tbody tr').length is 0
             @render()
 
-    changeUser: =>
-        app.deployUserPrompt()
-
     getRequest: (id) =>
         maybeRequest = @collection.models.filter (model) ->
             model.id is id

From bf60bd851df4f13b56e373ad5f654d15b789a1c4 Mon Sep 17 00:00:00 2001
From: Calvin Pomerantz <cpomerantz@hubspot.com>
Date: Tue, 3 May 2016 14:52:08 -0400
Subject: [PATCH 2/5] Change name of 'requested' collumn to 'Time of Last
 Deploy', a much more descriptive name

---
 .../app/templates/requestsTable/requestsPausedBody.hbs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SingularityUI/app/templates/requestsTable/requestsPausedBody.hbs b/SingularityUI/app/templates/requestsTable/requestsPausedBody.hbs
index 0ea72bd4be..3d47a32083 100644
--- a/SingularityUI/app/templates/requestsTable/requestsPausedBody.hbs
+++ b/SingularityUI/app/templates/requestsTable/requestsPausedBody.hbs
@@ -10,7 +10,7 @@
                         Type
                     </th>
                     <th class="hidden-xs" data-sort-attribute="requestDeployState.activeDeploy.timestamp">
-                        Requested
+                        Time of Last Deploy
                     </th>
                     <th class="hidden-sm hidden-xs" data-sort-attribute="requestDeployState.activeDeploy.user">
                         Deploy user

From e70f35a28c7e3835070add6f1cb014ce4eb09159 Mon Sep 17 00:00:00 2001
From: Calvin Pomerantz <cpomerantz@hubspot.com>
Date: Tue, 3 May 2016 15:11:28 -0400
Subject: [PATCH 3/5] Don't show deploy user for a request in 'My Paused
 Reqeusts' on the dashboard page

---
 .../requestsTable/requestsPausedBody.hbs         | 16 ++++++++++------
 SingularityUI/app/views/dashboard.coffee         |  1 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/SingularityUI/app/templates/requestsTable/requestsPausedBody.hbs b/SingularityUI/app/templates/requestsTable/requestsPausedBody.hbs
index 3d47a32083..07112c1ca2 100644
--- a/SingularityUI/app/templates/requestsTable/requestsPausedBody.hbs
+++ b/SingularityUI/app/templates/requestsTable/requestsPausedBody.hbs
@@ -12,9 +12,11 @@
                     <th class="hidden-xs" data-sort-attribute="requestDeployState.activeDeploy.timestamp">
                         Time of Last Deploy
                     </th>
-                    <th class="hidden-sm hidden-xs" data-sort-attribute="requestDeployState.activeDeploy.user">
-                        Deploy user
-                    </th>
+                    {{#unless onDashboardPage}}
+                        <th class="hidden-sm hidden-xs" data-sort-attribute="requestDeployState.activeDeploy.user">
+                            Deploy user
+                        </th>
+                    {{/unless}}
 
                     {{#ifInSubFilter 'SCHEDULED' requestsSubFilter}}
                         <th class="visible-lg visible-xl schedule-header" data-sort-attribute="request.schedule">
@@ -45,9 +47,11 @@
                         <td class="hidden-xs" data-value="{{requestDeployState.activeDeploy.timestamp}}">
                             {{timestampFromNow requestDeployState.activeDeploy.timestamp}}
                         </td>
-                        <td class="hidden-sm hidden-xs">
-                            {{usernameFromEmail requestDeployState.activeDeploy.user}}
-                        </td>
+                        {{#unless ../onDashboardPage}}
+                            <td class="hidden-sm hidden-xs">
+                                {{usernameFromEmail requestDeployState.activeDeploy.user}}
+                            </td>
+                        {{/unless}}
 
                         {{#ifInSubFilter 'SCHEDULED' ../requestsSubFilter}}
                             <td class="visible-lg visible-xl">
diff --git a/SingularityUI/app/views/dashboard.coffee b/SingularityUI/app/views/dashboard.coffee
index 96482ccde8..d33e5c4f4c 100644
--- a/SingularityUI/app/views/dashboard.coffee
+++ b/SingularityUI/app/views/dashboard.coffee
@@ -40,6 +40,7 @@ class DashboardView extends View
                 requests: pausedRequests
                 haveRequests: pausedRequests.length > 0
                 requestsSubFilter: ''
+                onDashboardPage: true
                 collectionSynced: @collection.synced
 
         @$el.html @templateBase context, partials

From acfceb4e21d98e1b86f93554eacd283b3c98b384 Mon Sep 17 00:00:00 2001
From: Calvin Pomerantz <cpomerantz@hubspot.com>
Date: Tue, 3 May 2016 15:13:35 -0400
Subject: [PATCH 4/5] Reqeusted -> 'Time of Last Deploy' on the starred
 requests table too

---
 SingularityUI/app/templates/dashboardTable/dashboardStarred.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SingularityUI/app/templates/dashboardTable/dashboardStarred.hbs b/SingularityUI/app/templates/dashboardTable/dashboardStarred.hbs
index ce38959ed8..50dbb663fe 100644
--- a/SingularityUI/app/templates/dashboardTable/dashboardStarred.hbs
+++ b/SingularityUI/app/templates/dashboardTable/dashboardStarred.hbs
@@ -4,7 +4,7 @@
             <tr>
                 <th>{{! Star column }}</th>
                 <th>Request</th>
-                <th class="hidden-xs">Requested</th>
+                <th class="hidden-xs">Time of Last Deploy</th>
                 <th>Status</th>
                 <th class="visible-lg visible-md">Deploy user</th>
                 <th class="visible-lg visible-md">Instances</th>

From ea709c7dfd1a9ed91a8b06a987a5746ddb6043d6 Mon Sep 17 00:00:00 2001
From: Calvin Pomerantz <cpomerantz@hubspot.com>
Date: Tue, 3 May 2016 15:17:36 -0400
Subject: [PATCH 5/5] Add 'Request Type' column to starred requests table on
 dashboard page

---
 .../app/templates/dashboardTable/dashboardStarred.hbs         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SingularityUI/app/templates/dashboardTable/dashboardStarred.hbs b/SingularityUI/app/templates/dashboardTable/dashboardStarred.hbs
index 50dbb663fe..836f1792c1 100644
--- a/SingularityUI/app/templates/dashboardTable/dashboardStarred.hbs
+++ b/SingularityUI/app/templates/dashboardTable/dashboardStarred.hbs
@@ -4,6 +4,7 @@
             <tr>
                 <th>{{! Star column }}</th>
                 <th>Request</th>
+                <th>Type</th>
                 <th class="hidden-xs">Time of Last Deploy</th>
                 <th>Status</th>
                 <th class="visible-lg visible-md">Deploy user</th>
@@ -24,6 +25,9 @@
                     {{ request.id }}
                 </a>
             </td>
+            <td>
+                {{humanizeText request.requestType}}
+            </td>
             <td class="hidden-xs" data-value="{{ requestDeployState.activeDeploy.timestamp }}">
                 <span title="{{ requestDeployState.activeDeploy.timestamp }}">
                     {{timestampFromNow requestDeployState.activeDeploy.timestamp}}