shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Merge pull request #35 from mabashian/7269-inv-org

Browse Source 
Fixed inventory organization link bug
This commit is contained in:
Michael Abashian 2017-07-25 09:29:44 -04:00 committed by GitHub
commit 6335953376
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/notifications/notifications.list.js
View File

@ -25,7 +25,7 @@ export default ['i18n', 'templateUrl', function(i18n, templateUrl){
key: true,
label: i18n._('Name'),
columnClass: 'col-md-3 col-sm-9 col-xs-9',
linkTo: '/#/notification_templates/{{notifier.id}}'
linkTo: '/#/notification_templates/{{notification.id}}'
},
notification_type: {
label: i18n._('Type'),

2
awx/ui/client/src/shared/directives.js
View File

@ -278,7 +278,7 @@ function(ConfigurationUtils, i18n, $rootScope) {
restrict: 'A',
link: function(scope, element, attrs) {
element.bind('click', function(event) {
if (attrs.disableRow) {
if (scope.$eval(attrs.disableRow)) {
event.preventDefault();
}
return;

4
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@ -322,8 +322,8 @@ export default ['$compile', 'Attr', 'Icon',
innerTable += "]\" ";
innerTable += "id=\"{{ " + list.iterator + ".id }}\" ";
innerTable += "class=\"List-tableRow " + list.iterator + "_class\" ";
innerTable += "ng-repeat=\"" + list.iterator + " in " + list.name + "\"";
innerTable += (list.disableRow) ? " disable-row=" + list.disableRow + " " : "";
innerTable += (list.disableRow) ? " disable-row=\"" + list.disableRow + "\" " : "";
innerTable += "ng-repeat=\"" + list.iterator + " in " + list.name;
innerTable += (list.trackBy) ? " track by " + list.trackBy : "";
innerTable += (list.orderBy) ? " | orderBy:'" + list.orderBy + "'" : "";
innerTable += (list.filterBy) ? " | filter: " + list.filterBy : "";