Repository: ambari Updated Branches: refs/heads/trunk 78310fd00 -> 270a80989
AMBARI-16447. [UI Issue]Execution of empty pig script allowed from UI (pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/270a8098 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/270a8098 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/270a8098 Branch: refs/heads/trunk Commit: 270a8098942d1b80347a798a3b5241bae1bd16d1 Parents: 78310fd Author: Pallav Kulshreshtha <pallav....@gmail.com> Authored: Thu May 12 15:11:06 2016 +0530 Committer: Pallav Kulshreshtha <pallav....@gmail.com> Committed: Thu May 12 15:11:06 2016 +0530 ---------------------------------------------------------------------- .../main/resources/ui/pig-web/app/controllers/scriptEdit.js | 8 ++++++++ .../pig/src/main/resources/ui/pig-web/app/translations.js | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/270a8098/contrib/views/pig/src/main/resources/ui/pig-web/app/controllers/scriptEdit.js ---------------------------------------------------------------------- diff --git a/contrib/views/pig/src/main/resources/ui/pig-web/app/controllers/scriptEdit.js b/contrib/views/pig/src/main/resources/ui/pig-web/app/controllers/scriptEdit.js index 60a04ce..cedc765 100644 --- a/contrib/views/pig/src/main/resources/ui/pig-web/app/controllers/scriptEdit.js +++ b/contrib/views/pig/src/main/resources/ui/pig-web/app/controllers/scriptEdit.js @@ -95,6 +95,14 @@ App.ScriptEditController = Em.ObjectController.extend({ this.set('content.argumentsArray',this.get('content.argumentsArray').removeObject(arg)); }, execute: function (script, operation) { + + var isEmpltyScript = Ember.isEmpty(script.get('pigScript').get('content').get('fileContent')); + + if( isEmpltyScript ){ + this.send('showAlert', {message:Em.I18n.t('scripts.modal.error_empty_scriptcontent'),status:'error',trace:null}); + return; + } + this.set('isExec',true); return Ember.RSVP.resolve(script.get('pigScript')) http://git-wip-us.apache.org/repos/asf/ambari/blob/270a8098/contrib/views/pig/src/main/resources/ui/pig-web/app/translations.js ---------------------------------------------------------------------- diff --git a/contrib/views/pig/src/main/resources/ui/pig-web/app/translations.js b/contrib/views/pig/src/main/resources/ui/pig-web/app/translations.js index 5bb8cf7..072b5c7 100644 --- a/contrib/views/pig/src/main/resources/ui/pig-web/app/translations.js +++ b/contrib/views/pig/src/main/resources/ui/pig-web/app/translations.js @@ -68,9 +68,8 @@ Ember.I18n.translations = { 'copy_created':'Copy Created', 'continue_editing':'Continue Editing', 'go_to_copy':'Go to Copy', - 'error_empty_title':'Name cannot be empty', - + 'error_empty_scriptcontent':'Script content cannot be empty', 'confirm_delete':'Confirm Delete', 'confirm_delete_massage':'Are you sure you want to delete {{title}} script?' },
