Эх сурвалжийг харах

[editor] Connect editor type with the right name

Enrico Berti 10 жил өмнө
parent
commit
63396db

+ 1 - 1
apps/beeswax/src/beeswax/settings.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 DJANGO_APPS = [ "beeswax" ]
-NICE_NAME = "Hive Editor"
+NICE_NAME = "Hive"
 REQUIRES_HADOOP = True
 ICON = "beeswax/art/icon_beeswax_48.png"
 MENU_INDEX = 10

+ 1 - 1
apps/impala/src/impala/settings.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 DJANGO_APPS = ['impala']
-NICE_NAME = 'Impala Editor'
+NICE_NAME = 'Impala'
 MENU_INDEX = 11
 ICON = 'impala/art/icon_impala_48.png'
 

+ 1 - 1
apps/impala/src/impala/tests.py

@@ -68,7 +68,7 @@ class TestMockedImpala:
 
   def test_basic_flow(self):
     response = self.client.get("/impala/")
-    assert_true(re.search('Impala Editor', response.content), response.content)
+    assert_true(re.search('Impala', response.content), response.content)
     assert_true('Query Editor' in response.content)
 
     response = self.client.get("/impala/execute/")

+ 2 - 2
desktop/libs/notebook/src/notebook/templates/editor.mako

@@ -22,7 +22,7 @@
 <%namespace name="koComponents" file="/ko_components.mako" />
 <%namespace name="editorComponents" file="editor_components.mako" />
 
-${ commonheader(_('Editor'), app_name, user, "68px") | n,unicode }
+${ commonheader(_('Editor'), editor_type, user, "68px") | n,unicode }
 
 <script type="text/javascript">
   if (window.location.hash != "") {
@@ -34,7 +34,7 @@ ${ commonheader(_('Editor'), app_name, user, "68px") | n,unicode }
 
 
 ${ editorComponents.includes() }
-${ editorComponents.topBar('editor') }
+${ editorComponents.topBar('editor', editor_type) }
 ${ editorComponents.commonHTML() }
 
 

+ 6 - 6
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -107,7 +107,7 @@ ${ require.config() }
 
 </%def>
 
-<%def name="topBar(mode='notebook', app_name='hive')">
+<%def name="topBar(mode='notebook', editor_type='hive')">
 <style type="text/css">
 % if conf.CUSTOM.BANNER_TOP_HTML.get():
   .search-bar {
@@ -134,7 +134,7 @@ ${ require.config() }
         <a class="btn" title="${ _('Player mode') }" rel="tooltip" data-placement="bottom" data-bind="click: function(){ hueUtils.goFullScreen(); $root.isEditing(false); $root.isPlayerMode(true); }">
           <i class="fa fa-expand"></i>
         </a>
-          % if app_name == 'impala':
+          % if editor_type == 'impala':
           <a class="btn pointer" title="${ _('Sessions') }" rel="tooltip" data-placement="bottom" data-toggle="modal" data-target="#sessionsDemiModal">
             <i class="fa fa-cogs"></i>
           </a>
@@ -143,7 +143,7 @@ ${ require.config() }
           <i class="fa fa-save"></i>
         </a>
 
-        <a class="btn" href="${ url('notebook:new') }" title="${ _('New Query') }" rel="tooltip" data-placement="bottom">
+        <a class="btn" href="${ url('notebook:editor') }" title="${ _('New Query') }" rel="tooltip" data-placement="bottom">
           <i class="fa fa-file-o"></i>
         </a>
 
@@ -220,15 +220,15 @@ ${ require.config() }
           <li class="currentApp">
             <a href="#">
             %if mode=='editor':
-              % if app_name == 'impala':
+              % if editor_type == 'impala':
                 <img src="${ static('impala/art/icon_impala_48.png') }" class="app-icon" />
                 Impala
-              % elif app_name == 'rdbms':
+              % elif editor_type == 'rdbms':
                 <img src="${ static('rdbms/art/icon_rdbms_48.png') }" class="app-icon" />
                 DB Query
               % else:
                 <img src="${ static('beeswax/art/icon_beeswax_48.png') }" class="app-icon" />
-                Hive Editor
+                Hive
               % endif
             %else:
               <i class="fa fa-file-text-o app-icon" style="vertical-align: middle"></i>

+ 1 - 0
desktop/libs/notebook/src/notebook/views.py

@@ -94,6 +94,7 @@ def editor(request):
       'options_json': json.dumps({
           'languages': [{"name": "%s SQL" % editor_type.title(), "type": editor_type}]
       }),
+      'editor_type': editor_type,
       'autocomplete_base_url': autocomplete_base_url,
   })