Removed the tag editor directive and used the existing tag editor pan…

…el on the create ELB wizard
eucalyptus · Apr 17, 2015 · e66fbed · e66fbed
1 parent c9b07fe
commit e66fbed
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 335 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -214,7 +214,6 @@ module.exports = function(grunt) {
           elb: ['eucaconsole/templates/dialogs/select_certificate_dialog.pt',
                 'eucaconsole/static/html/directives/instance_selector.html',
                 'eucaconsole/static/html/directives/elb_listener_editor.html',
-                'eucaconsole/static/html/directives/tag_editor.html',
                 'eucaconsole/templates/elbs/elb_wizard.pt'],
       }
   });

diff --git a/eucaconsole/static/html/directives/tag_editor.html b/eucaconsole/static/html/directives/tag_editor.html
diff --git a/eucaconsole/static/js/pages/eucaconsole_wizard.js b/eucaconsole/static/js/pages/eucaconsole_wizard.js
@@ -4,7 +4,7 @@
  *
  */
 
-angular.module('EucaConsoleWizard', ['EucaConsoleUtils', 'MagicSearch'])
+angular.module('EucaConsoleWizard', ['EucaConsoleUtils', 'MagicSearch', 'TagEditor'])
     .controller('EucaConsoleWizardCtrl', function ($scope, $http, $timeout, eucaHandleError, eucaUnescapeJson) {
         $scope.elbForm = undefined;
         $scope.urlParams = undefined;

diff --git a/eucaconsole/static/js/widgets/tag_editor_directive.js b/eucaconsole/static/js/widgets/tag_editor_directive.js
diff --git a/eucaconsole/templates/elbs/elb_wizard.pt b/eucaconsole/templates/elbs/elb_wizard.pt
@@ -60,10 +60,7 @@
                             </div>
                             <hr />
                             <div>
-                                <tag-editor
-                                    template="${request.static_path('eucaconsole:static/html/directives/tag_editor.html')}"
-                                    options='${controller_options_json}'>
-                                </tag-editor>
+                                ${panel('tag_editor', show_name_tag=True)}
                             </div>
                             <hr />
                             <div>
@@ -372,7 +369,6 @@
     <script src="${request.static_path('eucaconsole:static/js/pages/eucaconsole_wizard.js')}"></script>
     <script src="${request.static_path('eucaconsole:static/js/pages/elb_wizard.js')}"></script>
     <script src="${request.static_path('eucaconsole:static/js/widgets/elb_listener_editor.js')}"></script>
-    <script src="${request.static_path('eucaconsole:static/js/widgets/tag_editor_directive.js')}"></script>
     <script src="${request.static_path('eucaconsole:static/js/thirdparty/magic-search/magic_search.js')}"></script>
     <script src="${request.static_path('eucaconsole:static/js/widgets/instance_selector.js')}"></script>
 </div>