ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [01/34] ambari git commit: AMBARI-20717.Need to disable upload file option from file browser window in workflow manager(Venkata Sairam)
Date Mon, 17 Apr 2017 20:17:55 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-12556 9f6387157 -> b013be0b9


AMBARI-20717.Need to disable upload file option from file browser window in workflow manager(Venkata
Sairam)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 310c5544155e75879c78f9e7ceef8f35cf3da587
Parents: 11ab63f
Author: Venkata Sairam <venkatasairam.lanka@gmail.com>
Authored: Wed Apr 12 19:21:05 2017 +0530
Committer: Venkata Sairam <venkatasairam.lanka@gmail.com>
Committed: Wed Apr 12 19:23:18 2017 +0530

----------------------------------------------------------------------
 .../app/templates/components/bundle-config.hbs  |  2 +-
 .../app/templates/components/coord-config.hbs   |  2 +-
 .../app/templates/components/flow-designer.hbs  |  2 +-
 .../app/templates/components/hdfs-browser.hbs   | 44 ++++++++++----------
 4 files changed, 26 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/310c5544/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
index b674990..0ea6c4b 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
@@ -121,7 +121,7 @@
   </div>
 </div>
 {{#if showingFileBrowser}}
-  {{hdfs-browser closeFileBrowser="closeFileBrowser" selectFileCallback=selectFileCallback
filePath=filePath}}
+  {{hdfs-browser closeFileBrowser="closeFileBrowser" selectFileCallback=selectFileCallback
filePath=filePath hideUpload=true}}
 {{/if}}
 {{#if showingJobConfig}}
   {{job-config type='bundle' closeJobConfigs="closeBundleSubmitConfig" jobFilePath=bundleFilePath
openFileBrowser="openFileBrowser" closeFileBrowser="closeFileBrowser" jobConfigs=bundleConfigs
containsParameteriedPaths=containsParameteriedPaths jobConfigProperties=jobConfigProperties}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/310c5544/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs
index 3b1b6a9..8f88b88 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs
@@ -332,7 +332,7 @@
 </div>
 </div>
 {{#if showingFileBrowser}}
-{{hdfs-browser closeFileBrowser="closeFileBrowser" selectFileCallback=selectFileCallback
filePath=filePath}}
+{{hdfs-browser closeFileBrowser="closeFileBrowser" selectFileCallback=selectFileCallback
filePath=filePath hideUpload=true}}
 {{/if}}
 {{#if showingJobConfig}}
   {{job-config type='coord' closeJobConfigs="closeCoordSubmitConfig"

http://git-wip-us.apache.org/repos/asf/ambari/blob/310c5544/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
index 429e874..8c07d6d 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
@@ -279,7 +279,7 @@
   {{#global-config closeGlobalConfig="closeWorkflowGlobalProps" saveGlobalConfig="saveGlobalConfig"
actionModel=globalConfig}}{{/global-config}}
 {{/if}}
 {{#if showingFileBrowser}}
-  {{hdfs-browser closeFileBrowser="closeFileBrowser" selectFileCallback=selectFileCallback
filePath=workflowFilePath}}
+  {{hdfs-browser closeFileBrowser="closeFileBrowser" selectFileCallback=selectFileCallback
filePath=workflowFilePath hideUpload=true}}
 {{/if}}
 {{#if showingActionSettingsFileBrowser}}
   {{hdfs-browser closeFileBrowser="closeActionSettingsFileBrowser" selectFileCallback=selectFileCallback
filePath=actionSettingsFilePath}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/310c5544/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hdfs-browser.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hdfs-browser.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hdfs-browser.hbs
index 44f25c8..5779e36 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hdfs-browser.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hdfs-browser.hbs
@@ -25,30 +25,32 @@
           </div>
       </div>
       <div class="panel-default panel-files">
-        <div class="panel-heading">
-          <div class="row">
-             <div class="col-xs-12">
-                <div class="pull-right">
-                  <!-- <span class="">
-                      <button type="button" class="btn btn-default" {{action "createFolder"}}
disabled={{isFilePathInvalid}}>Create Folder</button>
-                  </span> -->
-                  {{#unless uploadSelected}}
-                    <span>
-                      <button type="button" class="btn btn-default" {{action "uploadSelect"}}
disabled={{isFilePathInvalid}}>Upload File</button>
-                    </span>
-                  {{/unless}}
-                  {{#if uploadSelected}}
-                  <span class="">
-                      <span class="file-upload-control">
-                        {{file-upload url="/upload" selectedPath=selectedPath uploadFailure="uploadFailure"
uploadSuccess="uploadSuccess" uploadValidation="uploadValidation"}}
+        {{#unless hideUpload}}
+          <div class="panel-heading">
+            <div class="row">
+               <div class="col-xs-12">
+                  <div class="pull-right">
+                    <!-- <span class="">
+                        <button type="button" class="btn btn-default" {{action "createFolder"}}
disabled={{isFilePathInvalid}}>Create Folder</button>
+                    </span> -->
+                    {{#unless uploadSelected}}
+                      <span>
+                        <button type="button" class="btn btn-default" {{action "uploadSelect"}}
disabled={{isFilePathInvalid}}>Upload File</button>
                       </span>
-                      <button type="button" class="close-icon" {{action "closeUpload"}}>x</button>
-                  </span>
-                  {{/if}}
+                    {{/unless}}
+                    {{#if uploadSelected}}
+                    <span class="">
+                        <span class="file-upload-control">
+                          {{file-upload url="/upload" selectedPath=selectedPath uploadFailure="uploadFailure"
uploadSuccess="uploadSuccess" uploadValidation="uploadValidation"}}
+                        </span>
+                        <button type="button" class="close-icon" {{action "closeUpload"}}>x</button>
+                    </span>
+                    {{/if}}
+                  </div>
                 </div>
-              </div>
+            </div>
           </div>
-        </div>
+        {{/unless}}
         <div class="panel-body">
           <div>
             {{#if showUploadSuccess}}


Mime
View raw message