AMBARI-8402. View: Pig ui updates + flow changes. Additional fix (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/10f4afc6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10f4afc6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10f4afc6 Branch: refs/heads/trunk Commit: 10f4afc6019880a797adaf07531766bcc87e9e76 Parents: ce7bfeb Author: Alex Antonenko <[email protected]> Authored: Fri Nov 28 18:28:40 2014 +0200 Committer: Alex Antonenko <[email protected]> Committed: Fri Nov 28 18:52:16 2014 +0200 ---------------------------------------------------------------------- .../main/resources/ui/pig-web/app/templates/pig/history.hbs | 6 +----- .../main/resources/ui/pig-web/app/templates/script/history.hbs | 5 ----- .../pig/src/main/resources/ui/pig-web/app/views/script/edit.js | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/10f4afc6/contrib/views/pig/src/main/resources/ui/pig-web/app/templates/pig/history.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/pig/src/main/resources/ui/pig-web/app/templates/pig/history.hbs b/contrib/views/pig/src/main/resources/ui/pig-web/app/templates/pig/history.hbs index e58e0df..7e7eb96 100644 --- a/contrib/views/pig/src/main/resources/ui/pig-web/app/templates/pig/history.hbs +++ b/contrib/views/pig/src/main/resources/ui/pig-web/app/templates/pig/history.hbs @@ -61,8 +61,4 @@ {{#if content}} {{partial 'partials/paginationControls'}} -{{/if}} - -{{#if content}} - {{partial 'partials/paginationControls'}} -{{/if}} +{{/if}} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/10f4afc6/contrib/views/pig/src/main/resources/ui/pig-web/app/templates/script/history.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/pig/src/main/resources/ui/pig-web/app/templates/script/history.hbs b/contrib/views/pig/src/main/resources/ui/pig-web/app/templates/script/history.hbs index 8f0ca34..6f6a321 100644 --- a/contrib/views/pig/src/main/resources/ui/pig-web/app/templates/script/history.hbs +++ b/contrib/views/pig/src/main/resources/ui/pig-web/app/templates/script/history.hbs @@ -25,11 +25,6 @@ <th>{{t 'history.duration'}}</th> <th>{{t 'common.actions'}}</th> </tr> - <th>{{t 'common.date'}}</th> - <th>{{t 'job.status'}}</th> - <th>{{t 'history.duration'}}</th> - <th>{{t 'common.actions'}}</th> - </tr> </thead> <tbody> {{#each paginatedContent}} http://git-wip-us.apache.org/repos/asf/ambari/blob/10f4afc6/contrib/views/pig/src/main/resources/ui/pig-web/app/views/script/edit.js ---------------------------------------------------------------------- diff --git a/contrib/views/pig/src/main/resources/ui/pig-web/app/views/script/edit.js b/contrib/views/pig/src/main/resources/ui/pig-web/app/views/script/edit.js index 9a10292..dcab6ce 100644 --- a/contrib/views/pig/src/main/resources/ui/pig-web/app/views/script/edit.js +++ b/contrib/views/pig/src/main/resources/ui/pig-web/app/views/script/edit.js @@ -32,7 +32,7 @@ App.ScriptEditView = Em.View.extend({ } }.observes('controller.titleWarn'), actions:{ - insertUdf:function () { + insertUdf:function (udf) { var code = this.get('controller.content.pigScript.fileContent'), registered = 'REGISTER ' + udf.get('path') + '\n' + code; this.set('controller.content.pigScript.fileContent',registered);
