From 61050e96a49438bfbf1c7834932596e446a90bfb Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 17 Jun 2013 15:59:27 +0530 Subject: [PATCH 1/4] [fields] [fix] last value bug --- public/js/legacy/widgets/form/fields.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/public/js/legacy/widgets/form/fields.js b/public/js/legacy/widgets/form/fields.js index 4f801d7e77..48b53d7ca9 100644 --- a/public/js/legacy/widgets/form/fields.js +++ b/public/js/legacy/widgets/form/fields.js @@ -467,6 +467,7 @@ DataField.prototype.make_input = function() { if(val==null)val=''; me.input.value = val; if(me.format_input)me.format_input(); + me.last_value = val; } } DataField.prototype.validate = function(v) { @@ -560,6 +561,7 @@ DateField.prototype.setup_input = function() { if(val==null)val=''; else val=dateutil.str_to_user(val); me.input.value = val; + me.last_value = val; } me.get_value = function() { if(me.input.value) @@ -629,6 +631,7 @@ LinkField.prototype.make_input = function() { me.input.set_input = function(val) { if(val==undefined)val=''; me.txt.value = val; + me.last_value = val; } me.get_value = function() { return me.txt.value; } @@ -971,6 +974,7 @@ CheckField.prototype.make_input = function() { var me = this; this.input.set_input = function(v) { me.input.checked = cint(v) ? true : false; + me.last_value = v; } this.get_value= function() { @@ -1004,6 +1008,7 @@ TextField.prototype.make_input = function() { } this.input.set_input = function(v) { me.input.value = (v==null ? "" : v); + me.last_value = v; } this.input.onchange = function() { me.set(me.input.value); @@ -1153,6 +1158,7 @@ SelectField.prototype.make_input = function() { } if(option === value) { me.input.value = value; + me.last_value = value; break; } } @@ -1241,6 +1247,7 @@ TimeField.prototype.make_input = function() { this.input.set_input = function(v) { $(me.input).val(v); + me.last_value = v; }; this.input.onchange = function() { From 63db1998ffae43e92dd6a2eccdf526755470e0fb Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 18 Jun 2013 18:49:17 +0530 Subject: [PATCH 2/4] [permission manager] [reset permissions] ignore permissions in import file --- webnotes/modules/import_file.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webnotes/modules/import_file.py b/webnotes/modules/import_file.py index e460a990f8..6cadd9e03c 100644 --- a/webnotes/modules/import_file.py +++ b/webnotes/modules/import_file.py @@ -86,7 +86,7 @@ def import_doclist(doclist): old_doc = webnotes.doc(doctype, name) # delete old - webnotes.delete_doc(doctype, name, force=1, ignore_doctypes =ignore, for_reload=True) + webnotes.delete_doc(doctype, name, force=1, ignore_doctypes=ignore, for_reload=True) # don't overwrite ignored docs doclist1 = remove_ignored_docs_if_they_already_exist(doclist, ignore, name) @@ -100,6 +100,7 @@ def import_doclist(doclist): new_bean.ignore_children_type = ignore new_bean.ignore_check_links = True new_bean.ignore_validate = True + new_bean.ignore_permissions = True if doctype=="DocType" and name in ["DocField", "DocType"]: new_bean.ignore_fields = True From 3915665cd8b07acd3dd77d68d3a720bf8a4a102e Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 19 Jun 2013 14:55:53 +0530 Subject: [PATCH 3/4] [login page] [usability] big signup button --- templates/js/login.js | 45 +++++++++++++++++++++++++++++--------- templates/pages/login.html | 11 ++-------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/templates/js/login.js b/templates/js/login.js index 2bd24bffa9..580674d005 100644 --- a/templates/js/login.js +++ b/templates/js/login.js @@ -1,8 +1,10 @@ - +var disable_signup = {{ disable_signup and "true" or "false" }}; var login = {}; $(document).ready(function(wrapper) { - $('#login_btn').click(login.do_login) + login.show_login(); + + $('#login_btn').click(login.do_login); $('#password').keypress(function(ev){ if(ev.which==13 && $('#password').val()) { @@ -62,7 +64,12 @@ login.do_login = function(){ if(data.message=="Logged In") { window.location.href = "app.html"; } else if(data.message=="No App") { - window.location.href = get_url_arg("from") || "index"; + if(localStorage) { + window.location.href = localStorage.getItem("last_visited") || "index"; + localStorage.removeItem("last_visited"); + } else { + window.location.href = "index"; + } } else { login.set_message(data.message); } @@ -72,22 +79,40 @@ login.do_login = function(){ return false; } -login.sign_up = function() { +login.show_login = function() { + $("#login_wrapper h3").html("Login"); + $("#login-label").html("Email Id"); + $("#password-row").toggle(true); + $("#full-name-row, #login_message").toggle(false); + $("#login_btn").html("Login").removeClass("btn-success"); + $("#switch-view").html('Forgot Password?'); + + if(!disable_signup) { + $("#switch-view").append('
\ + New User?
'); + } + + window.is_login = true; +} + +login.show_sign_up = function() { $("#login_wrapper h3").html("Sign Up"); $("#login-label").html("Email Id"); - $("#password-row, #sign-up-wrapper, #login_message").toggle(false); + $("#password-row, #login_message").toggle(false); $("#full-name-row").toggle(true); - $("#login_btn").html("Register"); - $("#forgot-wrapper").html("Login") + $("#login_btn").html("Sign Up").addClass("btn-success"); + $("#switch-view").html("Login"); window.is_sign_up = true; } login.show_forgot_password = function() { $("#login_wrapper h3").html("Forgot"); $("#login-label").html("Email Id"); - $("#password-row, #sign-up-wrapper, #login_message").toggle(false); - $("#login_btn").html("Send Password"); - $("#forgot-wrapper").html("Login") + $("#password-row, #login_message, #full-name-row").toggle(false); + $("#login_btn").html("Send Password").removeClass("btn-success"); + $("#switch-view").html("Login"); window.is_forgot = true; } diff --git a/templates/pages/login.html b/templates/pages/login.html index bc748fe4f8..66b3c6e3a0 100644 --- a/templates/pages/login.html +++ b/templates/pages/login.html @@ -34,7 +34,7 @@   + class="btn btn-primary">Login @@ -43,15 +43,8 @@
-

- Forgot Password

- {% if not disable_signup %} -

- New user? Sign Up

- {% endif %} +