vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[fix] send login emails immediately if now is True

Browse source
This commit is contained in:
Anand Doshi 2016-07-14 13:03:19 +05:30
parent 45c8e6369e
commit 1e098dc6d7
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/core/doctype/user/user.py
View file

@ -232,7 +232,7 @@ class User(Document):
frappe.sendmail(recipients=self.email, sender=sender, subject=subject,
message=frappe.get_template(template).render(args),
delayed=now if now!=None else self.flags.delay_emails)
delayed=(not now) if now!=None else self.flags.delay_emails)
def a_system_manager_should_exist(self):
if not self.get_other_system_managers():

16
frappe/public/css/docs.css
View file

@ -305,19 +305,19 @@ img {
margin: 0 auto;
max-width: 870px;
}
.page-container .page-content ol > li,
.page-container .page-content ul > li {
.page-container .webpage-content ol > li,
.page-container .webpage-content ul > li {
margin: 13px auto;
}
.page-container .page-content ol > li li,
.page-container .page-content ul > li li {
.page-container .webpage-content ol > li li,
.page-container .webpage-content ul > li li {
margin: 4px auto;
}
.page-container .page-content ol li ol {
.page-container .webpage-content ol li ol {
list-style-type: disc;
}
.page-container .page-content ul,
.page-container .page-content ol {
.page-container .webpage-content ul,
.page-container .webpage-content ol {
margin-bottom: 32px;
}
@media (min-width: 768px) {
@ -520,7 +520,7 @@ p {
margin-top: 24px;
font-size: 16px;
}
.docs-footer img.frappe-bird-grey {
.docs-footer img.frappe-bird {
width: 40px;
height: 40px;
background: #fff;