External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 18:37:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix merge spacing from conflicted merge

Browse Source
This commit is contained in:
Matthew Jones
2014-01-30 01:04:17 -05:00
parent 82b692be9c
commit 6ff98d87e9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/controllers/Inventories.js
View File

@@ -521,7 +521,7 @@ function InventoriesEdit ($scope, $location, $routeParams, $compile, GenerateLis
} }
$scope.showGroupActivity = function() { $scope.showGroupActivity = function() {
var url, title, group; var url, title, group;
if ($scope.selected_group_id) { if ($scope.selected_group_id) {
group = Find({ list: $scope.groups, key: 'id', val: $scope.selected_tree_id }); group = Find({ list: $scope.groups, key: 'id', val: $scope.selected_tree_id });
url = GetBasePath('activity_stream') + '?group__id=' + $scope.selected_group_id; url = GetBasePath('activity_stream') + '?group__id=' + $scope.selected_group_id;

2
awx/ui/static/js/lists/InventoryHosts.js
View File

@@ -100,7 +100,7 @@ angular.module('InventoryHostsDefinition', [])
ngHide: 'selected_tree_id == 1', //disable when 'All Hosts' selected ngHide: 'selected_tree_id == 1', //disable when 'All Hosts' selected
awToolTip: "Create a new host" awToolTip: "Create a new host"
}, },
stream: { stream: {
ngClick: "showHostActivity()", ngClick: "showHostActivity()",
awToolTip: "View Activity Stream", awToolTip: "View Activity Stream",
mode: 'all', mode: 'all',

6
awx/ui/static/js/widgets/Stream.js
View File

@@ -195,7 +195,7 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
if (activity.changes && activity.changes.name) { if (activity.changes && activity.changes.name) {
if (typeof activity.changes.name == 'string') { if (typeof activity.changes.name == 'string') {
name = ' ' + activity.changes.name; name = ' ' + activity.changes.name;
name_nolink = name; name_nolink = name;
} }
else if (typeof activity.changes.name == 'object' && Array.isArray(activity.changes.name)) { else if (typeof activity.changes.name == 'object' && Array.isArray(activity.changes.name)) {
name = ' ' + activity.changes.name[0]; name = ' ' + activity.changes.name[0];
@@ -219,7 +219,7 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
if (activity.operation != 'delete') { if (activity.operation != 'delete') {
obj1_obj['base'] = obj1; obj1_obj['base'] = obj1;
name = ' ' + '<a href=\"' + BuildUrl(obj1_obj) + '\">' + obj1_obj.id + '</a>'; name = ' ' + '<a href=\"' + BuildUrl(obj1_obj) + '\">' + obj1_obj.id + '</a>';
name_nolink = ' ' + obj1_obj.id; name_nolink = ' ' + obj1_obj.id;
} }
else { else {
name = ' ' + obj1_obj.id; name = ' ' + obj1_obj.id;
@@ -229,7 +229,7 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
} }
else if (obj1_obj && obj1_obj.name) { else if (obj1_obj && obj1_obj.name) {
name = ' ' + stripDeleted(obj1_obj.name); name = ' ' + stripDeleted(obj1_obj.name);
name_nolink = name; name_nolink = name;
} }
descr += obj1 + name; descr += obj1 + name;
descr_nolink += obj1 + name_nolink; descr_nolink += obj1 + name_nolink;