[MERGE] preference change password fixe
bzr revid: al@openerp.com-20120811195354-sayk1u53wy42vqc1
This commit is contained in:
commit
e1bc12fb27
|
@ -109,7 +109,7 @@ instance.web.Dialog = instance.web.Widget.extend({
|
||||||
} else if (val.slice(-1) == "%") {
|
} else if (val.slice(-1) == "%") {
|
||||||
return Math.round(available_size / 100 * parseInt(val.slice(0, -1), 10));
|
return Math.round(available_size / 100 * parseInt(val.slice(0, -1), 10));
|
||||||
} else {
|
} else {
|
||||||
return parseInt(val, 10);
|
return parseInt(val, 10);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
renderElement: function() {
|
renderElement: function() {
|
||||||
|
@ -123,7 +123,7 @@ instance.web.Dialog = instance.web.Widget.extend({
|
||||||
if (! this.dialog_inited)
|
if (! this.dialog_inited)
|
||||||
this.init_dialog();
|
this.init_dialog();
|
||||||
var o = this.get_options(options);
|
var o = this.get_options(options);
|
||||||
instance.web.dialog(this.$element, o).dialog('open');
|
instance.web.dialog(this.$element, o).dialog('open');
|
||||||
if (o.height === 'auto' && o.max_height) {
|
if (o.height === 'auto' && o.max_height) {
|
||||||
this.$element.css({ 'max-height': o.max_height, 'overflow-y': 'auto' });
|
this.$element.css({ 'max-height': o.max_height, 'overflow-y': 'auto' });
|
||||||
}
|
}
|
||||||
|
@ -627,7 +627,7 @@ instance.web.Reload = instance.web.Widget.extend({
|
||||||
var search = "?ts=" + timestamp;
|
var search = "?ts=" + timestamp;
|
||||||
if (l.search) {
|
if (l.search) {
|
||||||
search = l.search + "&ts=" + timestamp;
|
search = l.search + "&ts=" + timestamp;
|
||||||
}
|
}
|
||||||
var hash = l.hash;
|
var hash = l.hash;
|
||||||
if (this.menu_id) {
|
if (this.menu_id) {
|
||||||
hash = "#menu_id=" + this.menu_id;
|
hash = "#menu_id=" + this.menu_id;
|
||||||
|
@ -665,7 +665,7 @@ instance.web.ChangePassword = instance.web.Widget.extend({
|
||||||
template: "ChangePassword",
|
template: "ChangePassword",
|
||||||
start: function() {
|
start: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
self.$element.find("form[name=change_password_form]").validate({
|
self.$element.validate({
|
||||||
submitHandler: function (form) {
|
submitHandler: function (form) {
|
||||||
self.rpc("/web/session/change_password",{
|
self.rpc("/web/session/change_password",{
|
||||||
'fields': $(form).serializeArray()
|
'fields': $(form).serializeArray()
|
||||||
|
@ -685,7 +685,7 @@ instance.web.ChangePassword = instance.web.Widget.extend({
|
||||||
modal: true,
|
modal: true,
|
||||||
title: error.title,
|
title: error.title,
|
||||||
buttons: [
|
buttons: [
|
||||||
{text: _("Ok"), click: function() { $(this).dialog("close"); }}
|
{text: _t("Ok"), click: function() { $(this).dialog("close"); }}
|
||||||
]
|
]
|
||||||
}).html(error.error);
|
}).html(error.error);
|
||||||
},
|
},
|
||||||
|
|
|
@ -282,7 +282,7 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td><label for="new_password">New Password:</label></td>
|
<td><label for="new_password">New Password:</label></td>
|
||||||
<td><input type="password" name="new_password"
|
<td><input type="password" name="new_password"
|
||||||
minlength="1" autofocus="autofocus"/></td>
|
minlength="1"/></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><label for="confirm_pwd">Confirm Password:</label></td>
|
<td><label for="confirm_pwd">Confirm Password:</label></td>
|
||||||
|
@ -1049,7 +1049,7 @@
|
||||||
<span></span>
|
<span></span>
|
||||||
</span>
|
</span>
|
||||||
<img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i < size - 1"/>
|
<img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i < size - 1"/>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
</t>
|
</t>
|
||||||
</t>
|
</t>
|
||||||
|
|
Loading…
Reference in New Issue