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

added leave applications and block lists to calendar

Browse source
This commit is contained in:
Rushabh Mehta 2013-02-14 20:42:32 +05:30
parent 2ad8d31b6a
commit 4fe8b0a68b
6 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/doctype/event/event.txt
View file

@ -1,8 +1,8 @@
[
{
"creation": "2013-02-14 14:53:12",
"creation": "2013-02-14 18:10:53",
"docstatus": 0,
"modified": "2013-02-14 15:21:26",
"modified": "2013-02-14 19:20:21",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -83,7 +83,13 @@
"fieldname": "ends_on",
"fieldtype": "Datetime",
"label": "Ends on",
"reqd": 1
"reqd": 0
},
{
"doctype": "DocField",
"fieldname": "all_day",
"fieldtype": "Check",
"label": "All Day"
},
{
"doctype": "DocField",

2
public/js/legacy/widgets/form/form.js
View file

@ -462,7 +462,7 @@ _f.Frm.prototype.check_doc_perm = function() {
this.perm = wn.perm.get_perm(dt, dn);
if(!this.perm[0][READ]) {
wn.container.change_to('403');
wn.set_route("403");
return 0;
}
return 1

2
public/js/wn/request.js
View file

@ -169,7 +169,7 @@ wn.request.cleanup = function(opts, r) {
};
if(r['403']) {
wn.container.change_to('403');
wn.set_route('403');
}
if(r.docs) {

2
public/js/wn/views/formview.js
View file

@ -24,7 +24,7 @@ wn.views.formview = {
wn.views.formview.show(dt, new_name);
return;
} else {
wn.container.change_to('404');
wn.set_route('404');
}
return;
}

2
public/js/wn/views/pageview.js
View file

@ -29,7 +29,7 @@ wn.views.pageview = {
wn.views.pageview.with_page(name, function(r) {
if(r && r.exc) {
if(!r['403'])
wn.container.change_to('404');
wn.set_route('404');
} else if(!wn.pages[name]) {
new wn.views.Page(name);
}

2
webnotes/db.py
View file

@ -137,7 +137,7 @@ class Database:
self.sql(query)
def check_transaction_status(self, query):
if query and query.strip().split()[0].lower() in ['start', 'alter', 'drop', 'create', "begin"]:
if self.transaction_writes and query and query.strip().split()[0].lower() in ['start', 'alter', 'drop', 'create', "begin"]:
raise Exception, 'This statement can cause implicit commit'
if query and query.strip().lower()=='commit':