Repository: ambari Updated Branches: refs/heads/trunk 2bcc5d12b -> 37299ab31
AMBARI-7916. Admin View: description is being variable replaced. (Max Shepel via onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/37299ab3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/37299ab3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/37299ab3 Branch: refs/heads/trunk Commit: 37299ab312febb5b979c2d325a1a1f090ea98923 Parents: 2bcc5d1 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Thu Oct 23 12:23:30 2014 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Thu Oct 23 12:23:30 2014 +0300 ---------------------------------------------------------------------- .../ambariViews/CreateViewInstanceCtrl.js | 10 +-- .../ambariViews/CreateViewInstanceCtrl_test.js | 77 -------------------- 2 files changed, 1 insertion(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/37299ab3/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js index 68421fa..946d334 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js @@ -18,21 +18,13 @@ 'use strict'; angular.module('ambariAdminConsole') -.controller('CreateViewInstanceCtrl',['$scope', 'View', 'Alert', 'Auth', '$routeParams', '$location', 'UnsavedDialog', function($scope, View, Alert, Auth, $routeParams, $location, UnsavedDialog) { +.controller('CreateViewInstanceCtrl',['$scope', 'View', 'Alert', '$routeParams', '$location', 'UnsavedDialog', function($scope, View, Alert, $routeParams, $location, UnsavedDialog) { $scope.form = {}; var targetUrl = ''; function loadMeta(){ View.getMeta($routeParams.viewId, $scope.version).then(function(data) { var viewVersion = data.data; - var pattern = /{username}/; - viewVersion.ViewVersionInfo.parameters = viewVersion.ViewVersionInfo.parameters.map(function (item) { - var parameter = item; - if (pattern.test(item.description)) { - parameter.description = item.description.replace(pattern, Auth.getCurrentUser()); - } - return parameter; - }); $scope.view = viewVersion; $scope.instance = { http://git-wip-us.apache.org/repos/asf/ambari/blob/37299ab3/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/ambariViews/CreateViewInstanceCtrl_test.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/ambariViews/CreateViewInstanceCtrl_test.js b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/ambariViews/CreateViewInstanceCtrl_test.js deleted file mode 100644 index 4deaf52..0000000 --- a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/ambariViews/CreateViewInstanceCtrl_test.js +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -describe('#CreateViewInstanceCtrl', function () { - - describe('loadMeta', function () { - - var scope, ctrl, $window, $q, deferred; - - beforeEach(module('ambariAdminConsole', function ($provide) { - $provide.value('$window', { - location: { - pathname: 'http://c6401.ambari.apache.org:8080/views/ADMIN_VIEW/1.0.0/INSTANCE/#/' - } - }); - $provide.value('Auth', { - getCurrentUser: function () { - return 'admin'; - } - }); - $provide.value('View', { - getMeta: function () { - return deferred.promise; - }, - getVersions: function () { - var dfd = $q.defer(); - return dfd.promise; - } - }); - $provide.value('$routeParams', { - viewId: 'ADMIN_VIEW' - }); - })); - - beforeEach(inject(function ($rootScope, $controller, _$window_, _$q_) { - $q = _$q_; - $window = _$window_; - scope = $rootScope.$new(); - deferred = $q.defer(); - ctrl = $controller('CreateViewInstanceCtrl', { - $scope: scope - }); - })); - - it('should parse {username}', function () { - deferred.resolve({ - data: { - ViewVersionInfo: { - parameters: [{ - description: '{username}' - }] - } - } - }); - scope.version = '1.0.0'; - scope.$digest(); - chai.expect(scope.view.ViewVersionInfo.parameters[0].description).to.equal('admin'); - }); - - }); - -});
