Browse Source

HUE-405. Hue User Admin does not support non-ascii names

* Fix all occurrences of str() in mako files. They should be unicode().
bc Wong 15 years ago
parent
commit
59fb507b06

+ 4 - 4
apps/beeswax/src/beeswax/templates/create_table_manually.mako

@@ -218,7 +218,7 @@ ${wrappers.head('Create a Table', toolbar=has_tables, section='new table')}
                     with a letter or a digit.
                   </p>
                   <div class="bw-remove_column">
-                    ${str(form["_deleted"]) | n}
+                    ${unicode(form["_deleted"]) | n}
                   </div>
                 </dt>
                 <dd class="bw-column">
@@ -249,7 +249,7 @@ ${wrappers.head('Create a Table', toolbar=has_tables, section='new table')}
                         </div>
                       </div>
                     % endif
-                    ${str(form["_exists"]) | n}
+                    ${unicode(form["_exists"]) | n}
                     
                   </dl>
                 </dd>
@@ -262,7 +262,7 @@ ${wrappers.head('Create a Table', toolbar=has_tables, section='new table')}
               %endfor
             </div>
             <div class="bw-add_column">
-              ${str(columns_form.management_form) | n}
+              ${unicode(columns_form.management_form) | n}
             </div>
             <h2>Partitions</h2>
               ## See http://wiki.apache.org/hadoop/Hive/Tutorial
@@ -284,7 +284,7 @@ ${wrappers.head('Create a Table', toolbar=has_tables, section='new table')}
                 % endfor
               </div>
               <div class="bw-add_partition bw-add_column">
-                ${str(partitions_form.management_form) | n}
+                ${unicode(partitions_form.management_form) | n}
               </div>
           </dl>
           <input type="submit" class="bw-create_table_submit">

+ 2 - 2
apps/beeswax/src/beeswax/templates/define_columns.mako

@@ -31,7 +31,7 @@ ${wrappers.head('Define Columns')}
       <div class="jframe-hidden">
         ${util.render_form(file_form)}
         ${util.render_form(delim_form)}
-        ${str(column_formset.management_form) | n}
+        ${unicode(column_formset.management_form) | n}
       </div>
       <div class="hue-bc-section">
       <dt> Step 3: Define Your Columns </dt>
@@ -75,7 +75,7 @@ ${wrappers.head('Define Columns')}
                         render_default=True,
                         help="Type for this column",
                       )}
-                      ${str(form["_exists"]) | n}
+                      ${unicode(form["_exists"]) | n}
                     </td>
                   %endfor
                 </tr>

+ 3 - 3
apps/beeswax/src/beeswax/templates/execute.mako

@@ -129,7 +129,7 @@ ${wrappers.head('Hive Query', section='query')}
               % endfor
               <div class="bw-query_settings_add">
                 <button id="id_settings-add" value="True" name="settings-add" type="submit">+</button>
-                <div class="jframe-hidden">${str(form.settings.management_form) | n }</div>
+                <div class="jframe-hidden">${unicode(form.settings.management_form) | n }</div>
               </div>
             </dl>
           </dd>
@@ -160,7 +160,7 @@ ${wrappers.head('Hive Query', section='query')}
               % endfor
               <div class="bw-query_settings_add">
                 <button id="id_file_resources-add" value="True" name="file_resources-add" type="submit">+</button>
-                <div class="jframe-hidden">${str(form.file_resources.management_form) | n }</div>
+                <div class="jframe-hidden">${unicode(form.file_resources.management_form) | n }</div>
               </div>
             </dl>
           </dd>
@@ -191,7 +191,7 @@ ${wrappers.head('Hive Query', section='query')}
               % endfor
               <div class="bw-query_settings_add">
                 <button id="id_functions-add" value="True" name="functions-add" type="submit">+</button>
-                <div class="jframe-hidden">${str(form.functions.management_form) | n }</div>
+                <div class="jframe-hidden">${unicode(form.functions.management_form) | n }</div>
               </div>
             </dl>
           </dd>

+ 3 - 3
apps/beeswax/src/beeswax/templates/report_gen.mako

@@ -34,7 +34,7 @@ Error: <b>${error_message}</b>
 
     ## columns management form
     Add column:
-    ${str(mform.columns.management_form) | n}
+    ${unicode(mform.columns.management_form) | n}
 
     ## colums formset errors
     % for err in mform.columns.non_form_errors():
@@ -73,12 +73,12 @@ Error: <b>${error_message}</b>
 	% endfor
       </tr></table>
       % endfor
-      ${str(formset.management_form) | n }
+      ${unicode(formset.management_form) | n }
     </%def>
 
     <%def name="render_union_mform(umform, level)">
       <div style="margin-left:${level * 30}px;">
-	${str(umform.mgmt) | n}
+	${unicode(umform.mgmt) | n}
 	${util.render_form(umform.bool)}
 	<div style="border-width:1px; border-style:solid; border-color:black">
 	${render_conds_formset(umform.conds)}

+ 1 - 1
apps/beeswax/src/beeswax/templates/util.mako

@@ -38,7 +38,7 @@
   % for f in formset.forms:
     ${render_form(f)}
   % endfor
-  ${str(formset.management_form) | n }
+  ${unicode(formset.management_form) | n }
   </dl>
 </%def>
 

+ 3 - 3
apps/jframegallery/src/jframegallery/templates/gallery/Hue/forms_with_dependencies.mako

@@ -25,13 +25,13 @@
     </p>
     <form action="${url("jframegallery.views.forms_with_dependencies")}" method="post" class="dependency_form jframe_padded {'deps':${form.render_dep_metadata()|n}}">
       % if len(form.non_field_errors()):
-        ${str(form.non_field_errors()) | n}
+        ${unicode(form.non_field_errors()) | n}
       % endif
       % for field in form:
         <dt>${field.label_tag() | n}</dt>
-        <dd>${str(field) | n}
+        <dd>${unicode(field) | n}
           % if len(field.errors):
-            ${str(field.errors) | n}
+            ${unicode(field.errors) | n}
           % endif
         </dd>
       % endfor

+ 2 - 2
apps/useradmin/src/useradmin/templates/edit_user.mako

@@ -34,11 +34,11 @@
       <dl>
         <%def name="render_field(field)">
           <dt>${field.label_tag() | n}</dt>
-          <dd>${str(field) | n}</dd>
+          <dd>${unicode(field) | n}</dd>
           % if len(field.errors):
             <dt>&nbsp;</dt>
             <dd class="jframe-error validation-advice">
-               ${str(field.errors) | n}
+               ${unicode(field.errors) | n}
              </dd>
            % endif
         </%def>

+ 13 - 10
apps/useradmin/src/useradmin/tests.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 # Licensed to Cloudera, Inc. under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,14 +17,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Tests for "user admin"
+"""
+Tests for "user admin"
+"""
 
-from nose.tools import assert_true, assert_equal, assert_false
-from nose.plugins.attrib import attr
+from nose.tools import assert_true, assert_equal
 
 from desktop.lib.django_test_util import make_logged_in_client
 from django.contrib.auth.models import User
-from hadoop import mini_cluster
+from django.utils.encoding import smart_unicode
 
 def reset_all_users():
   """Reset to a clean state by deleting all users"""
@@ -44,17 +47,17 @@ def test_user_admin():
   # Edit it, to add a first and last name
   response = c.post('/useradmin/edit/test',
                     dict(username="test",
-                         first_name="Tom",
-                         last_name="Tester",
+                         first_name=u"Inglés",
+                         last_name=u"Español",
                          is_superuser="True",
                          is_active="True"))
   # Now make sure that those were materialized
   response = c.get('/useradmin/edit/test')
-  assert_equal("Tom", response.context["form"].instance.first_name)
-  assert_true("Tester" in response.content)
+  assert_equal(smart_unicode("Inglés"), response.context["form"].instance.first_name)
+  assert_true("Español" in response.content)
   # Shouldn't be able to demote to non-superuser
   response = c.post('/useradmin/edit/test', dict(username="test",
-                        first_name="Tom", last_name="Tester",
+                        first_name=u"Inglés", last_name=u"Español",
                         is_superuser=False, is_active=True))
   assert_true("You cannot remove" in response.content,
               "Shouldn't be able to remove the last superuser")
@@ -103,7 +106,7 @@ def test_user_admin():
   # Regular user should not be able to self-promote to superuser
   response = c_reg.post('/useradmin/edit/test_user_creation',
                         dict(username = "test_user_creation",
-                        first_name = "Hello",
+                        first_name = "OLÁ",
                         is_superuser = True,
                         is_active = True))
   assert_true("You cannot" in response.content,