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

Merge branch 'master' into stable

Browse source
This commit is contained in:
Rushabh Mehta 2011-08-22 11:55:44 +05:30
commit 5747ca08c4
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cgi-bin/webnotes/auth.py
View file

@ -104,7 +104,7 @@ class HTTPRequest:
else:
db_name = getattr(webnotes.defs,'default_db_name','')
webnotes.conn = webnotes.db.Database(user = db_name,password = getattr(webnotes.defs,'db_password',''))
webnotes.conn = webnotes.db.Database(user = db_name,password = getattr(webnotes.defs,'db_password', ''))
webnotes.ac_name = ac_name
# =================================================================================

6
cgi-bin/webnotes/db.py
View file

@ -26,7 +26,7 @@ class Database:
self.transaction_writes = 0
self.testing_tables = []
self.password = self.get_db_password(ac_name, password)
self.password = self.get_db_password(user, password)
self.connect()
if self.user != 'root':
@ -57,7 +57,9 @@ class Database:
return ''
def get_db_login(self, ac_name):
return getattr(defs,'db_name_map').get(ac_name, getattr(defs,'default_db_name'))
if hasattr(defs, 'db_name_map'):
return getattr(defs,'db_name_map').get(ac_name, getattr(defs,'default_db_name'))
else: return ac_name
def connect(self):
"""

2
cgi-bin/webnotes/widgets/page.py
View file

@ -19,7 +19,7 @@ class Page:
Loads page info from files in module
"""
# load js
doc.fields['__script'] = module.get_doc_file('page',doc.name,'.js').read()
doc.fields['__script'] = module.get_doc_file('page',doc.name,'.js').read() or doc.script
doc.script = None
# load css