ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vsai...@apache.org
Subject ambari git commit: AMBARI-20794.Need to show appropriate error message while deleting the workflow history in project manager(Supreeth Sharma via Venkata Sairam)
Date Tue, 25 Apr 2017 08:52:52 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c09c5c41c -> 349cd4d8a


AMBARI-20794.Need to show appropriate error message while deleting the workflow history in
project manager(Supreeth Sharma via Venkata Sairam)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/349cd4d8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/349cd4d8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/349cd4d8

Branch: refs/heads/branch-2.5
Commit: 349cd4d8aa9c5d11a86ccd57cd7f33823130bf39
Parents: c09c5c4
Author: Venkata Sairam <venkatasairam.lanka@gmail.com>
Authored: Tue Apr 25 14:16:58 2017 +0530
Committer: Venkata Sairam <venkatasairam.lanka@gmail.com>
Committed: Tue Apr 25 14:22:34 2017 +0530

----------------------------------------------------------------------
 .../wfmanager/src/main/resources/ui/app/components/drafts-wf.js | 2 +-
 .../views/wfmanager/src/main/resources/ui/app/styles/app.less   | 5 +++++
 .../main/resources/ui/app/templates/components/drafts-wf.hbs    | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/349cd4d8/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
index f6965f7..050a3b9 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
@@ -124,7 +124,7 @@ export default Ember.Component.extend({
         rec.destroyRecord().then(function () {
           self.get('recentFiles', self.get('store').peekAll("wfproject"));
           self.set("deleteInProgress", false);
-          self.set("deleteMsg", "Workflow successfully deleted.");
+          self.set("deleteMsg", "Successfully removed the item from history");
           self.get('store').unloadRecord(rec);
           self.set('filteredModels', self.get('store').peekAll("wfproject"));
           Ember.run.later(()=>{

http://git-wip-us.apache.org/repos/asf/ambari/blob/349cd4d8/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
index abb0637..0603b57 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
@@ -1819,3 +1819,8 @@ input:invalid {
   overflow-y: scroll;
   margin-bottom: 10px;
 }
+
+.note-info {
+  position: relative;
+  top: 10px;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/349cd4d8/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/drafts-wf.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/drafts-wf.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/drafts-wf.hbs
index 05599e5..f66b3ad 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/drafts-wf.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/drafts-wf.hbs
@@ -114,7 +114,9 @@
       </div>
       <div class="modal-body">
          {{#unless deleteMsg}}
-           <label>Do you want to delete the draft?</label>
+           <label>Do you want to remove this item from the history?</label>
+           <br/>
+           <div class="note-info">NOTE : This file will still be accessible under {{currentDraft.workflowDefinitionPath}}</div>
          {{/unless}}
          {{#if true}}
            {{spin-spinner lines=7 length=3 width=3 radius=3 top=-10 left=150}}


Mime
View raw message