profile fixes and ctrl+s issue in firefox
This commit is contained in:
parent
b11dab92f3
commit
78f7ff3649
6 changed files with 18 additions and 11 deletions
|
|
@ -147,6 +147,7 @@ class DoesNotExistError(ValidationError): pass
|
|||
class MandatoryError(ValidationError): pass
|
||||
class InvalidSignatureError(ValidationError): pass
|
||||
class RateLimitExceededError(ValidationError): pass
|
||||
class OutgoingEmailError(Exception): pass
|
||||
|
||||
def get_traceback():
|
||||
import utils
|
||||
|
|
|
|||
|
|
@ -37,8 +37,11 @@ class DocType:
|
|||
self.send_welcome_mail()
|
||||
webnotes.msgprint(_("Welcome Email Sent"))
|
||||
else:
|
||||
self.email_new_password()
|
||||
|
||||
try:
|
||||
self.email_new_password()
|
||||
except webnotes.OutgoingEmailError:
|
||||
pass # email server not set, don't send email
|
||||
|
||||
self.doc.new_password = ""
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{
|
||||
"creation": "2013-03-07 11:54:44",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-12-20 19:24:17",
|
||||
"modified": "2014-01-15 11:32:52",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
|
|
@ -183,18 +183,16 @@
|
|||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "user_image",
|
||||
"fieldtype": "Select",
|
||||
"fieldtype": "Attach",
|
||||
"hidden": 0,
|
||||
"label": "User Image",
|
||||
"options": "attach_files:"
|
||||
"label": "User Image"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "background_image",
|
||||
"fieldtype": "Select",
|
||||
"fieldtype": "Attach",
|
||||
"hidden": 0,
|
||||
"label": "Background Image",
|
||||
"options": "attach_files:"
|
||||
"label": "Background Image"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
|
|
|
|||
|
|
@ -206,6 +206,7 @@ wn.Application = Class.extend({
|
|||
return false;
|
||||
})
|
||||
.keydown("meta+s ctrl+s", function(e) {
|
||||
e.preventDefault();
|
||||
if(cur_frm) {
|
||||
cur_frm.save_or_update();
|
||||
} else if(wn.container.page.save_action) {
|
||||
|
|
|
|||
6
webnotes/templates/pages/login.py
Normal file
6
webnotes/templates/pages/login.py
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
import webnotes
|
||||
|
||||
def get_context():
|
||||
return {
|
||||
"title": webnotes._("Login")
|
||||
}
|
||||
|
|
@ -13,8 +13,6 @@ from webnotes import msgprint
|
|||
from webnotes.utils import cint, expand_partial_links
|
||||
import email.utils
|
||||
|
||||
class OutgoingEmailError(webnotes.ValidationError): pass
|
||||
|
||||
def get_email(recipients, sender='', msg='', subject='[No Subject]', text_content = None, footer=None):
|
||||
"""send an html email as multipart with attachments and all"""
|
||||
email = EMail(sender, recipients, subject)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue