Updated', + sourceModel: 'inventory_source', + sourceField: 'last_updated', + searchable: false, + nosort: false + }, + source: { + label: 'Source', + searchType: 'select', + searchOptions: [ + { name: "ec2", value: "ec2" }, + { name: "none", value: "" }, + { name: "rackspace", value: "rackspace" }], + sourceModel: 'inventory_source', + sourceField: 'source', + searchOnly: true + }, + has_external_source: { + label: 'Has external source?', + searchType: 'in', + searchValue: 'ec2,rackspace', + searchOnly: true, + sourceModel: 'inventory_source', + sourceField: 'source' + }, + has_active_failures: { + label: 'Has failed hosts?', + searchSingleValue: true, + searchType: 'boolean', + searchValue: 'true', + searchOnly: true + }, + last_update_failed: { + label: 'Update failed?', + searchType: 'select', + searchSingleValue: true, + searchValue: 'failed', + searchOnly: true, + sourceModel: 'inventory_source', + sourceField: 'status' + } + }, + + actions: { + + }, + + fieldActions: { + + } + }); diff --git a/awx/ui/static/js/lists/InventorySummary.js b/awx/ui/static/js/lists/InventorySummary.js index 046b1dcad4..fc680356f1 100644 --- a/awx/ui/static/js/lists/InventorySummary.js +++ b/awx/ui/static/js/lists/InventorySummary.js @@ -133,7 +133,8 @@ angular.module('InventorySummaryDefinition', []) mode: 'all', 'class': 'btn-xs btn-primary', awToolTip: "Refresh the page", - ngClick: "refresh()" + ngClick: "refresh()", + iconSize: 'large' } }, diff --git a/awx/ui/static/js/lists/JobEvents.js b/awx/ui/static/js/lists/JobEvents.js index 9f8bdd8093..0e9acaffc0 100644 --- a/awx/ui/static/js/lists/JobEvents.js +++ b/awx/ui/static/js/lists/JobEvents.js @@ -92,7 +92,8 @@ angular.module('JobEventsListDefinition', []) ngShow: "job_status == 'pending' || job_status == 'waiting' || job_status == 'running'", 'class': 'btn-xs btn-primary', awToolTip: "Refresh the page", - ngClick: "refresh()" + ngClick: "refresh()", + iconSize: 'large' } }, diff --git a/awx/ui/static/js/lists/JobHosts.js b/awx/ui/static/js/lists/JobHosts.js index 8784c14c18..4cfd73c2b7 100644 --- a/awx/ui/static/js/lists/JobHosts.js +++ b/awx/ui/static/js/lists/JobHosts.js @@ -126,7 +126,8 @@ angular.module('JobHostDefinition', []) ngShow: "host_id == null && (job_status == 'pending' || job_status == 'waiting' || job_status == 'running')", 'class': 'btn-xs btn-primary', awToolTip: "Refresh the page", - ngClick: "refresh()" + ngClick: "refresh()", + iconSize: 'large' } }, diff --git a/awx/ui/static/js/lists/Jobs.js b/awx/ui/static/js/lists/Jobs.js index 5ebd0e1a61..80ef8b7245 100644 --- a/awx/ui/static/js/lists/Jobs.js +++ b/awx/ui/static/js/lists/Jobs.js @@ -81,7 +81,8 @@ angular.module('JobsListDefinition', []) mode: 'all', 'class': 'btn-xs btn-primary', awToolTip: "Refresh the page", - ngClick: "refresh()" + ngClick: "refresh()", + iconSize: 'large' } }, diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js index 517e4936eb..64d37e6c91 100644 --- a/awx/ui/static/js/lists/Projects.js +++ b/awx/ui/static/js/lists/Projects.js @@ -78,7 +78,8 @@ angular.module('ProjectsListDefinition', []) mode: 'all', 'class': 'btn-xs btn-primary', awToolTip: "Refresh the page", - ngClick: "refresh()" + ngClick: "refresh()", + iconSize: 'large' } }, diff --git a/awx/ui/static/js/lists/Streams.js b/awx/ui/static/js/lists/Streams.js new file mode 100644 index 0000000000..ff17ad1cb4 --- /dev/null +++ b/awx/ui/static/js/lists/Streams.js @@ -0,0 +1,62 @@ +/********************************************* + * Copyright (c) 2013 AnsibleWorks, Inc. + * + * Streams.js + * List view object for activity stream data model. + * + * + */ +angular.module('StreamListDefinition', []) + .value( + 'StreamList', { + + name: 'activities', + iterator: 'activity', + editTitle: 'Activity Stream', + selectInstructions: '', + index: false, + hover: true, + "class": "table-condensed", + + fields: { + event_time: { + key: true, + label: 'When' + }, + user: { + label: 'Who', + sourceModel: 'user', + sourceField: 'username' + }, + operation: { + label: 'Operation' + }, + description: { + label: 'Description' + } + }, + + actions: { + refresh: { + dataPlacement: 'top', + icon: "icon-refresh", + mode: 'all', + 'class': 'btn-xs btn-primary', + awToolTip: "Refresh the page", + ngClick: "refreshStream()", + iconSize: 'large' + }, + close: { + dataPlacement: 'top', + icon: "icon-arrow-left", + mode: 'all', + 'class': 'btn-xs btn-primary', + awToolTip: "Close Activity Stream view", + ngClick: "closeStream()", + iconSize: 'large' + } + }, + + fieldActions: { + } + }); \ No newline at end of file diff --git a/awx/ui/static/js/widgets/JobStatus.js b/awx/ui/static/js/widgets/JobStatus.js index e8d015ba3d..574ada224d 100644 --- a/awx/ui/static/js/widgets/JobStatus.js +++ b/awx/ui/static/js/widgets/JobStatus.js @@ -15,7 +15,7 @@ angular.module('JobStatusWidget', ['RestServices', 'Utilities']) var scope = $rootScope.$new(); var jobCount, jobFails, inventoryCount, inventoryFails, groupCount, groupFails, hostCount, hostFails; var counts = 0; - var expectedCounts = 8; + var expectedCounts = 6; var target = params.target; if (scope.removeCountReceived) { @@ -25,17 +25,21 @@ angular.module('JobStatusWidget', ['RestServices', 'Utilities']) var rowcount = 0; - function makeRow(label, count, fail) { + function makeRow(params) { var html = ''; + var label = params.label; + var link = params.link; + var fail_link = params.fail_link; + var count = params.count; + var fail = params.fail; html += "
');
+
+ // Generate the list
+ var scope = view.inject(list, {
+ mode: 'edit',
+ id: 'stream-content',
+ breadCrumbs: true,
+ searchSize: 'col-lg-4'
+ });
+
+ scope.closeStream = function() {
+ HideStream();
+ }
+
+ scope.refreshStream = function() {
+ scope['activities'].splice(10,10);
+ //scope.search(list.iterator);
+ }
+
+ if (scope.removePostRefresh) {
+ scope.removePostRefresh();
+ }
+ scope.removePostRefresh = scope.$on('PostRefresh', function() {
+ for (var i=0; i < scope['activities'].length; i++) {
+ // Convert event_time date to local time zone
+ cDate = new Date(scope['activities'][i].event_time);
+ scope['activities'][i].event_time = FormatDate(cDate);
+ // Display username
+ scope['activities'][i].user = scope.activities[i].summary_fields.user.username;
+ }
+ ShowStream();
+ });
+
+ // Initialize search and paginate pieces and load data
+ SearchInit({ scope: scope, set: list.name, list: list, url: defaultUrl });
+ PaginateInit({ scope: scope, list: list, url: defaultUrl });
+ scope.search(list.iterator);
+
+ }
+ }]);
+
\ No newline at end of file
diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less
index 3cfa4f9ec0..2746804dd4 100644
--- a/awx/ui/static/less/ansible-ui.less
+++ b/awx/ui/static/less/ansible-ui.less
@@ -487,10 +487,10 @@ legend {
margin: 10px 0 0 0;
}
-.page-size {
- height: 25px;
- font-size: 10.5px;
- line-height: normal;
+select.page-size {
+ width: 65px;
+ height: 24px;
+ font-size: 10px;
}
.page-size-label {
@@ -642,7 +642,7 @@ input[type="checkbox"].checkbox-no-label {
text-align: right;
button {
- margin-left: 8px;
+ margin-left: 4px;
}
}
@@ -1374,6 +1374,31 @@ tr td button i {
}
+/* Activity Stream Widget */
+
+ #stream-container {
+ display: none;
+ }
+
+ #stream-content {
+ border: 1px solid @grey;
+ border-radius: 8px;
+ padding: 8px;
+ }
+
+ /*
+ .activity-btn {
+ padding-left: 2px;
+ padding-right: 2px;
+ padding-bottom: 2px;
+ img {
+ width: 16px;
+ height: 16px;
+ }
+ }
+ */
+
+
/* Large desktop */
@media (min-width: 1200px) {
diff --git a/awx/ui/static/lib/ansible/Utilities.js b/awx/ui/static/lib/ansible/Utilities.js
index bf39e22598..99d579d1f9 100644
--- a/awx/ui/static/lib/ansible/Utilities.js
+++ b/awx/ui/static/lib/ansible/Utilities.js
@@ -109,14 +109,10 @@ angular.module('Utilities',['RestServices', 'Utilities'])
}
Alert(defaultMsg.hdr, msg);
}
- else if (status == 401 && data.detail && data.detail == 'Token is expired') {
+ else if ( (status == 401 && data.detail && data.detail == 'Token is expired') ||
+ (status == 401 && data.detail && data.detail == 'Invalid token') ) {
$rootScope.sessionTimer.expireSession();
- window.location = '/#/login'; //resetting location so that we drop search params
- }
- else if (status == 401 && data.detail && data.detail == 'Invalid token') {
- // should this condition be treated as an expired session?? Yes, for now.
- $rootScope.sessionTimer.expireSession();
- window.location = '/#/login'; //resetting location so that we drop search params
+ $location.url('/login');
}
else if (data.non_field_errors) {
Alert('Error!', data.non_field_errors);
diff --git a/awx/ui/static/lib/ansible/generator-helpers.js b/awx/ui/static/lib/ansible/generator-helpers.js
index 49d323504e..2e6b037cae 100644
--- a/awx/ui/static/lib/ansible/generator-helpers.js
+++ b/awx/ui/static/lib/ansible/generator-helpers.js
@@ -138,6 +138,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
html += (btn.ngShow) ? Attr(btn, 'ngShow') : "";
html += (btn.ngHide) ? Attr(btn, 'ngHide') : "";
html += " >";
+ html += (btn['img']) ? "