Merge lp:~jfb-tempo-consulting/unifield-web/us-1519 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/database.py'
--- addons/openerp/controllers/database.py	2016-05-09 12:01:47 +0000
+++ addons/openerp/controllers/database.py	2016-08-23 11:52:35 +0000
@@ -50,20 +50,52 @@
     except:
         return []
 
+class ReplacePasswordField(openobject.widgets.PasswordField):
+    params = {
+        'autocomplete': 'Autocomplete field',
+    }
+    autocomplete = 'off'
+    replace_for = False
+
+    def __init__(self, *arg, **kwargs):
+        # disable form default submit action when user hits Enter in the field
+        self.replace_for = kwargs['name']
+        kwargs['name'] = 'show_%s' % kwargs['name']
+        kwargs.setdefault('attrs', {}).update({
+            'onkeydown': 'if (event.keyCode == 13) replace_pass_submit()',
+            'class': 'requiredfield',
+        })
+        super(ReplacePasswordField, self).__init__(*arg, **kwargs)
+
+
 class DBForm(openobject.widgets.Form):
     strip_name = True
 
     def __init__(self, *args, **kw):
         super(DBForm, self).__init__(*args, **kw)
+        to_add = []
+        for field in self.fields:
+            if isinstance(field, ReplacePasswordField):
+                to_add.append(openobject.widgets.HiddenField(name=field.replace_for, attrs={'autocomplete':'off'}))
+                self.replace_password_fields[field.name] = field.replace_for
+        if to_add:
+            self.hidden_fields += to_add
         if self.validator is openobject.validators.DefaultValidator:
             self.validator = openobject.validators.Schema()
         for f in self.fields:
             self.validator.add_field(f.name, f.validator)
+        for add in to_add:
+            self.validator.add_field(add.name, formencode.validators.NotEmpty())
 
     def update_params(self, params):
         super(DBForm, self).update_params(params)
         params['attrs']['action'] = url(self.action)
 
+    def error_for(self, item, error):
+        if error and isinstance(item, ReplacePasswordField):
+            return error.error_dict.get(item.replace_for)
+        return super(DBForm, self).error_for(item, error)
+
 class FormCreate(DBForm):
     name = "create"
     string = _('Create database')
@@ -71,31 +103,37 @@
     submit_text = _('Create')
     strip_name = True
     form_attrs = {'onsubmit': 'return on_create()'}
-    fields = [openobject.widgets.PasswordField(name='password', label=_('Super admin password:'), validator=formencode.validators.NotEmpty(), help=_("This is the password of the user that have the rights to administer databases. This is not a OpenERP user, just a super administrator.")),
-              openobject.widgets.TextField(name='dbname', label=_('New database name:'), validator=formencode.validators.NotEmpty(), help=_("Choose the name of the database that will be created. The name must not contain any special character. Exemple: 'terp'.")),
-#              openobject.widgets.CheckBox(name='demo_data', label=_('Load Demonstration data:'), default=False, validator=validators.Bool(if_empty=False), help=_("Check this box if you want demonstration data to be installed on your new database. These data will help you to understand OpenERP, with predefined products, partners, etc.")),
-              openobject.widgets.SelectField(name='language', options=get_lang_list, validator=validators.String(), label=_('Default Language:'), help=_("Choose the default language that will be installed for this database. You will be able to install new languages after installation through the administration menu.")),
-              openobject.widgets.PasswordField(name='admin_password', label=_('Administrator password:'), validator=formencode.validators.NotEmpty(), help=_("This is the password of the 'admin' user that will be created in your new database.")),
-              openobject.widgets.PasswordField(name='confirm_password', label=_('Confirm password:'), validator=formencode.validators.NotEmpty(), help=_("This is the password of the 'admin' user that will be created in your new database. It has to be the same than the above field."))
-              ]
+    fields = [
+        ReplacePasswordField(name='password', label=_('Super admin password:'), help=_("This is the password of the user that have the rights to administer databases. This is not a OpenERP user, just a super administrator.")),
+        openobject.widgets.TextField(name='dbname', label=_('New database name:'), validator=formencode.validators.NotEmpty(), help=_("Choose the name of the database that will be created. The name must not contain any special character. Exemple: 'terp'.")),
+#       openobject.widgets.CheckBox(name='demo_data', label=_('Load Demonstration data:'), default=False, validator=validators.Bool(if_empty=False), help=_("Check this box if you want demonstration data to be installed on your new database. These data will help you to understand OpenERP, with predefined products, partners, etc.")),
+        openobject.widgets.SelectField(name='language', options=get_lang_list, validator=validators.String(), label=_('Default Language:'), help=_("Choose the default language that will be installed for this database. You will be able to install new languages after installation through the administration menu.")),
+        ReplacePasswordField(name='confirm_password', label=_('Confirm password:'), help=_("This is the password of the 'admin' user that will be created in your new database. It has to be the same than the above field.")),
+        ReplacePasswordField(name='admin_password', label=_('Administrator password:'), help=_("This is the password of the 'admin' user that will be created in your new database.")),
+    ]
     validator = openobject.validators.Schema(chained_validators=[formencode.validators.FieldsMatch("admin_password","confirm_password")])
 
+
 class FormDrop(DBForm):
     name = "drop"
     string = _('Drop database')
     action = '/openerp/database/do_drop'
     submit_text = _('Drop')
     form_attrs = {'onsubmit': 'return window.confirm(_("Do you really want to drop the selected database?"))'}
-    fields = [openobject.widgets.SelectField(name='dbname', options=get_db_list, label=_('Database:'), validator=validators.String(not_empty=True)),
-              openobject.widgets.PasswordField(name='password', label=_('Drop password:'), validator=formencode.validators.NotEmpty())]
+    fields = [
+        openobject.widgets.SelectField(name='dbname', options=get_db_list, label=_('Database:'), validator=validators.String(not_empty=True)),
+        ReplacePasswordField(name='password', label=_('Drop password:')),
+    ]
 
 class FormBackup(DBForm):
     name = "backup"
     string = _('Backup database')
     action = '/openerp/database/do_backup'
     submit_text = _('Backup')
-    fields = [openobject.widgets.SelectField(name='dbname', options=get_db_list, label=_('Database:'), validator=validators.String(not_empty=True)),
-              openobject.widgets.PasswordField(name='password', label=_('Backup password:'), validator=formencode.validators.NotEmpty())]
+    fields = [
+        openobject.widgets.SelectField(name='dbname', options=get_db_list, label=_('Database:'), validator=validators.String(not_empty=True)),
+        ReplacePasswordField(name='password', label=_('Backup password:')),
+    ]
 
 class FileField(openobject.widgets.FileField):
     def adjust_value(self, value, **params):
@@ -106,9 +144,12 @@
     string = _('Restore database')
     action = '/openerp/database/do_restore'
     submit_text = _('Restore')
-    fields = [FileField(name="filename", label=_('File:')),
-              openobject.widgets.PasswordField(name='password', label=_('Restore password:'), validator=formencode.validators.NotEmpty()),
-              openobject.widgets.TextField(name='dbname', label=_('New database name:'), validator=formencode.validators.NotEmpty(), readonly=1, attrs={'readonly': ''})]
+    fields = [
+        FileField(name="filename", label=_('File:')),
+        ReplacePasswordField(name='password', label=_('Restore password:')),
+        openobject.widgets.TextField(name='dbname', label=_('New database name:'), validator=formencode.validators.NotEmpty(), readonly=1, attrs={'readonly': ''})
+    ]
+
     hidden_fields = [openobject.widgets.HiddenField(name='fpath', label=_('Path:'))]
 
 class FormPassword(DBForm):
@@ -116,10 +157,11 @@
     string = _('Change Administrator Password')
     action = '/openerp/database/do_password'
     submit_text = _('Change Password')
-    fields = [openobject.widgets.PasswordField(name='old_password', label=_('Old super admin password:'), validator=formencode.validators.NotEmpty()),
-              openobject.widgets.PasswordField(name='new_password', label=_('New super admin password:'), validator=formencode.validators.NotEmpty()),
-              openobject.widgets.PasswordField(name='confirm_password', label=_('Confirm Password:'), validator=formencode.validators.NotEmpty())]
-
+    fields = [
+        ReplacePasswordField(name='old_password', label=_('Old super admin password:')),
+        ReplacePasswordField(name='new_password', label=_('New super admin password:')),
+        ReplacePasswordField(name='confirm_password', label=_('Confirm Password:')),
+    ]
     validator = openobject.validators.Schema(chained_validators=[formencode.validators.FieldsMatch("new_password","confirm_password")])
 
 
 
=== modified file 'addons/openerp/controllers/preferences.py'
--- addons/openerp/controllers/preferences.py	2015-05-13 15:01:35 +0000
+++ addons/openerp/controllers/preferences.py	2016-08-23 11:52:35 +0000
@@ -34,9 +34,11 @@
 class PrefsPassword(database.FormPassword):
     action = "/openerp/pref/password"
     string = _('Change your password')
-    fields = [openobject.widgets.PasswordField(name='old_password', label=_('Old Password:'), validator=formencode.validators.NotEmpty()),
-              openobject.widgets.PasswordField(name='new_password', label=_('New Password:'), validator=formencode.validators.NotEmpty()),
-              openobject.widgets.PasswordField(name='confirm_password', label=_('Confirm Password:'), validator=formencode.validators.NotEmpty())]
+    fields = [
+        database.ReplacePasswordField(name='old_password', label=_('Old Password:')),
+        database.ReplacePasswordField(name='new_password', label=_('New Password:')),
+        database.ReplacePasswordField(name='confirm_password', label=_('Confirm Password:')),
+    ]
 
 int_pattern = re.compile(r'^\d+$')
 class Preferences(Form):
 
=== modified file 'addons/openerp/controllers/root.py'
--- addons/openerp/controllers/root.py	2014-01-10 17:12:18 +0000
+++ addons/openerp/controllers/root.py	2016-08-23 11:52:35 +0000
@@ -150,6 +150,13 @@
                                       .get_controller('/openerp/widgets')\
                                       .user_home_widgets(ctx))
 
+    @expose()
+    def do_login(self, *arg, **kw):
+        target = kw.get('target') or '/'
+        if target.startswith('/openerp/do_login'):
+            target = '/'
+        raise redirect(target)
+
     @expose(allow_json=True)
     @unsecured
     def login(self, db=None, user=None, password=None, style=None, location=None, message=None, **kw):
 
=== modified file 'addons/openerp/controllers/templates/login.mako'
--- addons/openerp/controllers/templates/login.mako	2016-03-04 16:58:44 +0000
+++ addons/openerp/controllers/templates/login.mako	2016-08-23 11:52:35 +0000
@@ -12,6 +12,15 @@
                           form.attr('action') + separator + jQuery.param({'next': url}));
             })
         }
+        function disable_save() {
+            var pass = $("#show_password").val()
+            $("#password").val(pass);
+            $("#show_password").val(false);
+            $("#replace_password").show();
+            $("#replace_password").val(Array(pass.length+1).join('\u2022'));
+            $("#show_password").remove();
+            $("#loginform").submit();
+        }
     </script>
 </%def>
 
@@ -51,11 +60,15 @@
                                 </tr>
                                 <tr>
                                     <td class="label"><label for="user">${_("User:")}</label></td>
-                                    <td style="padding: 3px;"><input type="text" id="user" name="user" class="db_user_pass" value="${user}" autofocus="true"/></td>
+                                    <td style="padding: 3px;"><input type="text" id="user" name="user" class="db_user_pass" value="${user}" autofocus="true" autocomplete="off"/></td>
                                 </tr>
                                 <tr>
-                                    <td class="label"><label for="password">${_("Password:")}</label></td>
-                                    <td style="padding: 3px;"><input type="password" value="${password}" id="password" name="password" class="db_user_pass" autocomplete="off"/></td>
+                                    <td class="label"><label for="show_password">${_("Password:")}</label></td>
+                                    <td style="padding: 3px;"><input type="password" id="show_password" name="show_password" class="db_user_pass" autocomplete="off" onkeydown = "if (event.keyCode == 13) disable_save()"/>
+                                    <input id="replace_password" type="text" class="db_user_pass" style="display:none;"/>
+                                    <input type="hidden" name="password" id="password" />
+                                    </td>
+
                                 </tr>
                                 <tr>
                                     <td></td>
@@ -64,7 +77,7 @@
                                             <button type="button" class="static_boxes" tabindex="-1" onclick="location.href='${py.url('/openerp/database')}'">${_("Databases")}
                                             </button>
                                         % endif
-                                        <button type="submit" class="static_boxes">${_("Login")}</button>
+                                        <button type="button" class="static_boxes" onclick="disable_save()">${_("Login")}</button>
                                     </td>
                                 </tr>
                             </table>
 
=== modified file 'addons/openerp/controllers/utils.py'
--- addons/openerp/controllers/utils.py	2016-07-18 12:51:46 +0000
+++ addons/openerp/controllers/utils.py	2016-08-23 11:52:35 +0000
@@ -94,7 +94,10 @@
         info = rpc.session.execute_noauth('common', 'login_message') or ''
     except:
         pass
-    return dict(target=target, url=url, dblist=dblist, db=db, user=user, password=password,
+    do_login_page = '/openerp/do_login'
+    if target != do_login_page:
+        origArgs['target'] = target
+    return dict(target=do_login_page, url=url, dblist=dblist, db=db, user=user, password=password,
             action=action, message=message, origArgs=origArgs, info=info, bad_regional=bad_regional, tz_offset=tz_offset)
 
 def secured(fn):
 
=== modified file 'openobject/widgets/_widgets.py'
--- openobject/widgets/_widgets.py	2012-10-22 12:24:58 +0000
+++ openobject/widgets/_widgets.py	2016-08-23 11:52:35 +0000
@@ -226,7 +226,7 @@
 
     template = "/openobject/widgets/templates/form.mako"
 
-    params = ['action', 'method', 'submit_text']
+    params = ['action', 'method', 'submit_text', 'replace_password_fields']
     member_widgets = ['hidden_fields', 'fields']
 
     hidden_fields = []
@@ -236,6 +236,7 @@
     submit_text = "Submit"
     form_attrs = {}
     form = True
+    replace_password_fields = {}
 
     def __init__(self, name=None, **params):
         super(Form, self).__init__(name, **params)
 
=== modified file 'openobject/widgets/templates/form.mako'
--- openobject/widgets/templates/form.mako	2010-12-03 06:06:41 +0000
+++ openobject/widgets/templates/form.mako	2016-08-23 11:52:35 +0000
@@ -32,7 +32,38 @@
         % endfor
         <tr>
             <td>&nbsp;</td>
-            <td align="right" style="padding: 0px 5px 5px 0px;"><button type="submit" class="static_boxes">${submit_text}</button></td>
+            <td align="right" style="padding: 0px 5px 5px 0px;">
+            % if not replace_password_fields:
+                <button type="submit" class="static_boxes">${submit_text}</button>
+            % else:
+                <script type="text/javascript">
+                function replace_pass_submit() {
+                    var this_form = false;
+                    % for src_field, target_field in replace_password_fields.iteritems():
+                        if (!this_form) {
+                            this_form = $("#${target_field}").attr('form');
+                            var result = true;
+                            if (this_form.onsubmit) {
+                                result = this_form.onsubmit.call(this_form);
+                            }
+                            if (!result) {
+                                return false;
+                            }
+                        }
+                        var ${src_field}_val = $("#${src_field}").val()
+                        var fake_${src_field} = jQuery('<input type="text"/>');
+                        fake_${src_field}.addClass($("#${src_field}").attr('class'));
+                        fake_${src_field}.val(Array(${src_field}_val.length+1).join('\u2022'));
+                        $("#${target_field}").val(${src_field}_val);
+                        $("#${src_field}").val(false);
+                        $("#${src_field}").replaceWith(fake_${src_field});
+                    % endfor
+                    this_form.submit();
+                }
+                </script>
+                <button type="button" class="static_boxes" onclick="replace_pass_submit()">${submit_text}</button>
+            % endif
+            </td>
         </tr>
     </table>
 </form>