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 @@
{{#if deployUser}} -

{{ deployUser }} change

+

{{ deployUser }}

{{else}}

Singularity

{{/if}} diff --git a/SingularityUI/app/templates/dashboardTable/dashboardStarred.hbs b/SingularityUI/app/templates/dashboardTable/dashboardStarred.hbs index ce38959ed8..836f1792c1 100644 --- a/SingularityUI/app/templates/dashboardTable/dashboardStarred.hbs +++ b/SingularityUI/app/templates/dashboardTable/dashboardStarred.hbs @@ -4,7 +4,8 @@ {{! Star column }} Request - Requested + Type + Time of Last Deploy Status Deploy user Instances @@ -24,6 +25,9 @@ {{ request.id }} + + {{humanizeText request.requestType}} + {{timestampFromNow requestDeployState.activeDeploy.timestamp}} diff --git a/SingularityUI/app/templates/requestsTable/requestsPausedBody.hbs b/SingularityUI/app/templates/requestsTable/requestsPausedBody.hbs index 0ea72bd4be..07112c1ca2 100644 --- a/SingularityUI/app/templates/requestsTable/requestsPausedBody.hbs +++ b/SingularityUI/app/templates/requestsTable/requestsPausedBody.hbs @@ -10,11 +10,13 @@ Type - Requested - - - Deploy user + Time of Last Deploy + {{#unless onDashboardPage}} + + Deploy user + + {{/unless}} {{#ifInSubFilter 'SCHEDULED' requestsSubFilter}} @@ -45,9 +47,11 @@ {{timestampFromNow requestDeployState.activeDeploy.timestamp}} - - {{usernameFromEmail requestDeployState.activeDeploy.user}} - + {{#unless ../onDashboardPage}} + + {{usernameFromEmail requestDeployState.activeDeploy.user}} + + {{/unless}} {{#ifInSubFilter 'SCHEDULED' ../requestsSubFilter}} diff --git a/SingularityUI/app/views/dashboard.coffee b/SingularityUI/app/views/dashboard.coffee index 3cff838329..d33e5c4f4c 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' @@ -41,6 +40,7 @@ class DashboardView extends View requests: pausedRequests haveRequests: pausedRequests.length > 0 requestsSubFilter: '' + onDashboardPage: true collectionSynced: @collection.synced @$el.html @templateBase context, partials @@ -119,9 +119,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