AMBARI-21360: Ability to delete a view instance from view instance list (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f4fb1742 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4fb1742 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4fb1742 Branch: refs/heads/branch-feature-logsearch-ui Commit: f4fb1742b1ba29247da897f4ca1dd67a82a34c1b Parents: 5c874cc Author: Sangeeta Ravindran <sangee...@apache.org> Authored: Wed Jun 28 10:49:31 2017 -0700 Committer: Sangeeta Ravindran <sangee...@apache.org> Committed: Wed Jun 28 10:49:31 2017 -0700 ---------------------------------------------------------------------- AMBARI-21360.patch | 45 --------------------------------------------- 1 file changed, 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f4fb1742/AMBARI-21360.patch ---------------------------------------------------------------------- diff --git a/AMBARI-21360.patch b/AMBARI-21360.patch deleted file mode 100644 index c26f3a0..0000000 --- a/AMBARI-21360.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js -index c41e5d4..4e7bae3 100644 ---- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js -+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js -@@ -132,6 +132,26 @@ angular.module('ambariAdminConsole') - } - }; - -+ $scope.deleteInstance = function(instance) { -+ ConfirmationModal.show( -+ $t('common.delete', { -+ term: $t('views.viewInstance') -+ }), -+ $t('common.deleteConfirmation', { -+ instanceType: $t('views.viewInstance'), -+ instanceName: instance.ViewInstanceInfo.label -+ }) -+ ).then(function() { -+ View.deleteInstance(instance.ViewInstanceInfo.view_name, instance.ViewInstanceInfo.version, instance.ViewInstanceInfo.instance_name) -+ .then(function() { -+ loadViews(); -+ }) -+ .catch(function(data) { -+ Alert.error($t('views.alerts.cannotDeleteInstance'), data.data.message); -+ }); -+ }); -+ }; -+ - $scope.reloadViews = function () { - loadViews(); - }; -diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html -index 59c322f..91b9a93 100644 ---- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html -+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html -@@ -81,6 +81,9 @@ - <td class="col-sm-1"> - <a class="instance-link ng-scope ng-binding" href="#/views/{{view.view_name}}/versions/{{instance.ViewInstanceInfo.version}}/instances/{{instance.ViewInstanceInfo.instance_name}}/clone"><i class="fa fa-copy"></i></a> - </td> -+ <td class="col-sm-1"> -+ <a class="instance-link ng-scope ng-binding" href ng-click="deleteInstance(instance)"><i class="fa fa-trash-o"></i></a> -+ </td> - </tr> - </tbody> - <tfoot>