diff --git a/awx/ui/client/src/projects/list/projects-list.controller.js b/awx/ui/client/src/projects/list/projects-list.controller.js index 4aef74979c..e70c12f44d 100644 --- a/awx/ui/client/src/projects/list/projects-list.controller.js +++ b/awx/ui/client/src/projects/list/projects-list.controller.js @@ -62,13 +62,6 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', }); } - if (list.fields.scm_revision && $scope.options && - $scope.options.hasOwnProperty('scm_revision')) { - console.log(list.fields.scm_revision); - itm.scm_revision = $filter('limitTo')(itm.scm_revision, 7, 0); - - } - buildTooltips(itm); }); diff --git a/awx/ui/client/src/projects/main.js b/awx/ui/client/src/projects/main.js index b43d1d29a4..1b76213cd3 100644 --- a/awx/ui/client/src/projects/main.js +++ b/awx/ui/client/src/projects/main.js @@ -13,9 +13,10 @@ import { N_ } from '../i18n'; import GetProjectPath from './factories/get-project-path.factory'; import GetProjectIcon from './factories/get-project-icon.factory'; import GetProjectToolTip from './factories/get-project-tool-tip.factory'; +import revisions from './revisions/main'; export default -angular.module('Projects', []) +angular.module('Projects', [revisions.name]) .controller('ProjectsList', ProjectsList) .controller('ProjectsAdd', ProjectsAdd) .controller('ProjectsEdit', ProjectsEdit) diff --git a/awx/ui/client/src/projects/projects.list.js b/awx/ui/client/src/projects/projects.list.js index 3bff8e9825..eacfdb72d4 100644 --- a/awx/ui/client/src/projects/projects.list.js +++ b/awx/ui/client/src/projects/projects.list.js @@ -50,16 +50,7 @@ export default ['i18n', function(i18n) { excludeModal: true, columnClass: 'col-lg-4 col-md-2 col-sm-3 hidden-xs', class: 'List-staticColumnAdjacent--monospace', - ngBind: 'project.scm_revision', - badgeCustom: true, - badgePlacement: 'right', - badgeIcon: `See More - See Less` + type: 'revision' }, last_updated: { label: i18n._('Last Updated'), diff --git a/awx/ui/client/src/projects/revisions/main.js b/awx/ui/client/src/projects/revisions/main.js new file mode 100644 index 0000000000..592cc2c976 --- /dev/null +++ b/awx/ui/client/src/projects/revisions/main.js @@ -0,0 +1,11 @@ +/************************************************* + * Copyright (c) 2015 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import revisions from './revisions.directive'; + +export default + angular.module('revisions', []) + .directive('revisions', revisions); \ No newline at end of file diff --git a/awx/ui/client/src/projects/revisions/revisions.directive.js b/awx/ui/client/src/projects/revisions/revisions.directive.js new file mode 100644 index 0000000000..75f261e392 --- /dev/null +++ b/awx/ui/client/src/projects/revisions/revisions.directive.js @@ -0,0 +1,24 @@ +export default + [ 'templateUrl', + 'Rest', + '$q', + '$filter', + function(templateUrl, Rest, $q, $filter) { + return { + restrict: 'E', + scope: false, + templateUrl: templateUrl('projects/revisions/revisions'), + link: function(scope) { + var full_revision = scope.project.scm_revision; + console.log(scope.project.scm_revision); + scope.seeMoreInactive = true; + scope.count = scope.project.scm_revision.length; + scope.revisionHash = $filter('limitTo')(full_revision, 7, 0); + + scope.Copy = function() { + console.log('copy'); + }; + } + }; + } + ]; \ No newline at end of file diff --git a/awx/ui/client/src/projects/revisions/revisions.partial.html b/awx/ui/client/src/projects/revisions/revisions.partial.html new file mode 100644 index 0000000000..10f8b5ecfc --- /dev/null +++ b/awx/ui/client/src/projects/revisions/revisions.partial.html @@ -0,0 +1,9 @@ +