From 40d638b045cb75221b54f5c3e84947789492c65e Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 22 Jun 2011 13:58:46 +0530 Subject: [PATCH 1/8] Modified send method of FormEmail class: changed method call attach to attach_file --- cgi-bin/webnotes/utils/email_lib/form_email.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cgi-bin/webnotes/utils/email_lib/form_email.py b/cgi-bin/webnotes/utils/email_lib/form_email.py index 5bd3be8007..979f1f8b86 100644 --- a/cgi-bin/webnotes/utils/email_lib/form_email.py +++ b/cgi-bin/webnotes/utils/email_lib/form_email.py @@ -148,9 +148,11 @@ class FormEmail: self.email.add_attachment(self.dn.replace(' ','').replace('/','-') + '.html', self.body) # attachments + # self.with_attachments comes from http form variables + # i.e. with_attachments=1 if cint(self.with_attachments): for a in self.set_attachments(): - a and self.email.attach(a.split(',')[0]) + a and self.email.attach_file(a.split(',')[0]) # cc if self.cc: From e7462499d92972b20fef01f7b266257679e79c42 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 27 Jun 2011 10:58:32 +0530 Subject: [PATCH 2/8] fix to install.py --- cgi-bin/webnotes/install_lib/install.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cgi-bin/webnotes/install_lib/install.py b/cgi-bin/webnotes/install_lib/install.py index 2a014b4398..e4791b66e9 100755 --- a/cgi-bin/webnotes/install_lib/install.py +++ b/cgi-bin/webnotes/install_lib/install.py @@ -21,6 +21,9 @@ def copy_defs(): # class Installer: def __init__(self, root_login, root_password): + + import webnotes + import webnotes.db self.root_password = root_password from webnotes.model.db_schema import DbManager @@ -35,6 +38,8 @@ class Installer: # run framework related cleanups # def framework_cleanups(self, target): + + import webnotes self.dbman.drop_table('__DocTypeCache') webnotes.conn.sql("create table `__DocTypeCache` (name VARCHAR(120), modified DATETIME, content TEXT, server_code_compiled TEXT)") @@ -48,6 +53,7 @@ class Installer: Imports the "Core" module from .txt file and creates Creates profile Administrator """ + import webnotes from webnotes.modules.import_module import import_module from webnotes.modules.module_manager import reload_doc From 5033f1f36488d13fd4b1fc1c73502454bd4a6e70 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 27 Jun 2011 11:02:52 +0530 Subject: [PATCH 3/8] fixes in install --- cgi-bin/webnotes/install_lib/install.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cgi-bin/webnotes/install_lib/install.py b/cgi-bin/webnotes/install_lib/install.py index e4791b66e9..dc720bdfa6 100755 --- a/cgi-bin/webnotes/install_lib/install.py +++ b/cgi-bin/webnotes/install_lib/install.py @@ -24,6 +24,7 @@ class Installer: import webnotes import webnotes.db + import webnotes.defs self.root_password = root_password from webnotes.model.db_schema import DbManager @@ -32,7 +33,7 @@ class Installer: webnotes.conn=self.conn webnotes.session= {'user':'Administrator'} self.dbman = DbManager(self.conn) - self.mysql_path = hasattr(defs, 'mysql_path') and webnotes.defs.mysql_path or '' + self.mysql_path = hasattr(webnotes.defs, 'mysql_path') and webnotes.defs.mysql_path or '' # # run framework related cleanups @@ -101,6 +102,7 @@ class Installer: """ a very simplified version, just for the time being..will eventually be deprecated once the framework stabilizes. """ + import webnotes.defs #Storing passed source path passed_source_path = source_path @@ -113,7 +115,7 @@ class Installer: self.dbman.delete_user(target) # create user and db - self.dbman.create_user(target,getattr(defs,'db_password',None)) + self.dbman.create_user(target,getattr(webnotes.defs,'db_password',None)) if verbose: print "Created user %s" % target # create a database @@ -159,7 +161,7 @@ def make_scheduler(root_login, root_password, verbose): dbman.delete_user('master_scheduler') # create user and db - dbman.create_user('master_scheduler', getattr(defs,'db_password',None)) + dbman.create_user('master_scheduler', getattr(webnotes.defs,'db_password',None)) if verbose: print "Created user master_scheduler" # create a database @@ -215,14 +217,14 @@ if __name__=='__main__': try: - from webnotes import defs import webnotes import webnotes.db + import webnotes.defs except ImportError: copy_defs() - from webnotes import defs import webnotes import webnotes.db + import webnotes.defs if len(args)==3: From 74720f659f9549e119a82860418df99adb88f088 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 27 Jun 2011 11:23:28 +0530 Subject: [PATCH 4/8] space allowed in db password --- cgi-bin/webnotes/install_lib/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/webnotes/install_lib/install.py b/cgi-bin/webnotes/install_lib/install.py index dc720bdfa6..b54db527e8 100755 --- a/cgi-bin/webnotes/install_lib/install.py +++ b/cgi-bin/webnotes/install_lib/install.py @@ -133,7 +133,7 @@ class Installer: # import in target if verbose: print "Starting database import..." - self.dbman.restore_database(target, source_path, self.root_password) + self.dbman.restore_database(target, source_path, self.root_password.replace(' ','\ ')) if verbose: print "Imported from database %s" % source_path #If source path is passed From 9fcb4c230fd35936129defa78a53a5e7f96c608f Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 27 Jun 2011 12:33:39 +0530 Subject: [PATCH 5/8] bug fix in core/doctype/profile naming --- cgi-bin/core/doctype/profile/profile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cgi-bin/core/doctype/profile/profile.py b/cgi-bin/core/doctype/profile/profile.py index 60388f039f..d4684a7bf3 100644 --- a/cgi-bin/core/doctype/profile/profile.py +++ b/cgi-bin/core/doctype/profile/profile.py @@ -25,7 +25,8 @@ class DocType: if not validate_email_add(self.doc.email): msgprint("%s is not a valid email id" % self.doc.email) raise Exception - self.doc.name = self.doc.email + + self.doc.name = self.doc.email def on_update(self): # owner is always name From 923a1e5447ecefa0d5175141a1e949ba4daadd47 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 27 Jun 2011 16:39:03 +0530 Subject: [PATCH 6/8] validate criteria name --- .gitignore | 3 +++ .../search_criteria/search_criteria.py | 3 +++ cgi-bin/webnotes/install_lib/install.py | 20 ++++++++++++++----- 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..117b892b34 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.pyc +*.comp.js +*.DS_Store diff --git a/cgi-bin/core/doctype/search_criteria/search_criteria.py b/cgi-bin/core/doctype/search_criteria/search_criteria.py index 2acbc16c3b..b9b5d3c84c 100644 --- a/cgi-bin/core/doctype/search_criteria/search_criteria.py +++ b/cgi-bin/core/doctype/search_criteria/search_criteria.py @@ -26,6 +26,9 @@ class DocType: doctype_module = sql("select module from tabDocType where name = '%s'" % (self.doc.doc_type)) webnotes.conn.set(self.doc,'module',doctype_module and doctype_module[0][0] or 'NULL') + def validate(self): + sql("select name from `tabSearch Criteria` where criteria_name=%s and name!=%s", (self.doc.criteria_name, self.doc.name)) + def on_update(self): self.set_module() self.export_doc() diff --git a/cgi-bin/webnotes/install_lib/install.py b/cgi-bin/webnotes/install_lib/install.py index 5612f36ce2..c801f4720f 100755 --- a/cgi-bin/webnotes/install_lib/install.py +++ b/cgi-bin/webnotes/install_lib/install.py @@ -57,6 +57,10 @@ class Installer: import_module('core') + def create_users(self): + """ + Create Administrator / Guest + """ webnotes.conn.begin() from webnotes.model.doc import Document @@ -96,10 +100,6 @@ class Installer: a very simplified version, just for the time being..will eventually be deprecated once the framework stabilizes. """ - # get the path of the sql file to import - if not source_path: - source_path = os.path.join(os.path.sep.join(os.path.abspath(webnotes.__file__).split(os.path.sep)[:-3]), 'data', 'Framework.sql') - # delete user (if exists) self.dbman.delete_user(target) @@ -122,10 +122,20 @@ class Installer: # import in target if verbose: print "Starting database import..." + + # get the path of the sql file to import + source_given = True + if not source_path: + source_given = False + source_path = os.path.join(os.path.sep.join(os.path.abspath(webnotes.__file__).split(os.path.sep)[:-3]), 'data', 'Framework.sql') + self.dbman.restore_database(target, source_path, self.root_password) if verbose: print "Imported from database %s" % source_path - self.import_core_module() + if not source_given: + if verbose: print "Importing core module..." + self.import_core_module() + self.create_users() # framework cleanups self.framework_cleanups(target) From ca6e0771a9523219f38f80d6b3f3c0f2492e75e8 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 27 Jun 2011 16:40:19 +0530 Subject: [PATCH 7/8] validate criteria name --- cgi-bin/core/doctype/search_criteria/search_criteria.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cgi-bin/core/doctype/search_criteria/search_criteria.py b/cgi-bin/core/doctype/search_criteria/search_criteria.py index b9b5d3c84c..00e5eb4330 100644 --- a/cgi-bin/core/doctype/search_criteria/search_criteria.py +++ b/cgi-bin/core/doctype/search_criteria/search_criteria.py @@ -27,7 +27,8 @@ class DocType: webnotes.conn.set(self.doc,'module',doctype_module and doctype_module[0][0] or 'NULL') def validate(self): - sql("select name from `tabSearch Criteria` where criteria_name=%s and name!=%s", (self.doc.criteria_name, self.doc.name)) + if sql("select name from `tabSearch Criteria` where criteria_name=%s and name!=%s", (self.doc.criteria_name, self.doc.name)): + webnots.msgprint("Criteria Name '%s' already used, please use another name" % self.doc.criteria_name, raise_exception = 1) def on_update(self): self.set_module() From 3ee3a7ef4d01657227e7cc40e8696deaa6607f39 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 28 Jun 2011 21:10:05 +0530 Subject: [PATCH 8/8] form style and module fixes --- cgi-bin/webnotes/modules/__init__.py | 26 +++++++++++++++++++++- cgi-bin/webnotes/modules/module_manager.py | 24 -------------------- js/form.compressed.js | 2 +- js/widgets/form/form_container.js | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cgi-bin/webnotes/modules/__init__.py b/cgi-bin/webnotes/modules/__init__.py index 665c77013c..62efefc36a 100644 --- a/cgi-bin/webnotes/modules/__init__.py +++ b/cgi-bin/webnotes/modules/__init__.py @@ -62,4 +62,28 @@ def get_module_path(module): # get module path by importing the module modules_path = os.path.join(webnotes.defs.modules_path, scrub(module)) - return modules_path \ No newline at end of file + return modules_path + +def switch_module(dt, dn, to, frm=None, export=None): + """ + Change the module of the given doctype, if export is true, then also export txt and copy + code files from src + """ + import os + webnotes.conn.sql("update `tab"+dt+"` set module=%s where name=%s", (to, dn)) + + if export: + export_doc(dt, dn) + + # copy code files + if dt in ('DocType', 'Page', 'Search Criteria'): + from_path = os.path.join(get_module_path(frm), scrub(dt), scrub(dn), scrub(dn)) + to_path = os.path.join(get_module_path(to), scrub(dt), scrub(dn), scrub(dn)) + + # make dire if exists + os.system('mkdir -p %s' % os.path.join(get_module_path(to), scrub(dt), scrub(dn))) + + for ext in ('py','js','html','css'): + os.system('cp %s %s') + + diff --git a/cgi-bin/webnotes/modules/module_manager.py b/cgi-bin/webnotes/modules/module_manager.py index 90679df0b2..c166646bff 100644 --- a/cgi-bin/webnotes/modules/module_manager.py +++ b/cgi-bin/webnotes/modules/module_manager.py @@ -1,27 +1,3 @@ -#============================================================================== -# script to change the module name in the database & update svn -#============================================================================== - -def change_module(dt, dn, from_module, to_module): - import os, webnotes.defs - from webnotes.modules import scrub - - # change in db - webnotes.conn.sql("update `tab%s` set module=%s where name=%s" % (dt, '%s', '%s'), (to_module, dn)) - - # export files - from webnotes.modules.export_module import export_to_files - export_to_files(record_list = [[dt, dn]]) - - if dt in ['DocType','Page','Search Criteria']: - dt, dn = scrub(dt), scrub(dn) - - # svn add - webnotes.msgprint(os.popen("svn add %s" % os.path.join(webnotes.defs.modules_path, scrub(to_module), dt, dn)).read()) - - # svn remove - webnotes.msgprint(os.popen("svn remove %s" % os.path.join(webnotes.defs.modules_path, scrub(from_module), dt, dn)).read()) - #============================================================================== diff --git a/js/form.compressed.js b/js/form.compressed.js index 3ebd877383..32c2369634 100644 --- a/js/form.compressed.js +++ b/js/form.compressed.js @@ -1,5 +1,5 @@ -_f.FrmContainer=function(){this.wrapper=page_body.add_page("Forms",function(){},function(){});this.last_displayed=null;$dh(this.wrapper);this.body=$a(this.wrapper,'div');_f.frm_dialog=new _f.FrmDialog();} +_f.FrmContainer=function(){this.wrapper=page_body.add_page("Forms",function(){},function(){});this.last_displayed=null;$dh(this.wrapper);this.body=$a(this.wrapper,'div','frm_container');_f.frm_dialog=new _f.FrmDialog();} _f.frm_dialog=null;_f.calling_doc_stack=[];_f.temp_access={};_f.FrmDialog=function(){var me=this;this.last_displayed=null;var d=new Dialog(640,null,'Edit Row');this.body=$a(d.body,'div','dialog_frm');$y(d.body,{backgroundColor:'#EEE'});d.done_btn_area=$a(d.body,'div','',{margin:'8px'});me.on_complete=function(){if(me.table_form){me.dialog.hide();}else{var callback=function(r){var dn=cur_frm.docname;if(!r.exc){me.dialog.hide();} if(me.on_save_callback) me.on_save_callback(dn);} diff --git a/js/widgets/form/form_container.js b/js/widgets/form/form_container.js index 980b952419..eacd237e37 100644 --- a/js/widgets/form/form_container.js +++ b/js/widgets/form/form_container.js @@ -5,7 +5,7 @@ _f.FrmContainer = function() { // create hidden $dh(this.wrapper); - this.body = $a(this.wrapper,'div'); + this.body = $a(this.wrapper,'div','frm_container'); // make by twin _f.frm_dialog = new _f.FrmDialog();