odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Merge document chagnes 

bzr revid: sbh@tinyerp.com-20120614070134-2to8qgr8cx1y2vux
This commit is contained in:
Sbh (Openerp) 2012-06-14 12:31:34 +05:30
parent a1d3ff9291 3611f431b9
commit ac75daf8a5
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/document/document_directory.py
View File

@ -78,9 +78,8 @@ class document_directory(osv.osv):
root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
return root_id
except Exception, e:
import netsvc
logger = netsvc.Logger()
logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set directory root:'+ str(e))
import logging
logging.getLogger('document').warning('Cannot set directory root:'+ str(e))
return False
return objid.browse(cr, uid, mid, context=context).res_id

13
addons/document_ftp/ftpserver/__init__.py
View File

@ -23,7 +23,7 @@ import threading
import ftpserver
import authorizer
import abstracted_fs
import netsvc
import logging
from tools import config
def start_server():
@ -35,9 +35,6 @@ def start_server():
PASSIVE_PORTS = int(pps[0]), int(pps[1])
class ftp_server(threading.Thread):
def log(self, level, message):
logger = netsvc.Logger()
logger.notifyChannel('FTP', level, message)
def run(self):
autho = authorizer.authorizer()
@ -48,17 +45,17 @@ def start_server():
if PASSIVE_PORTS:
ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg)
ftpserver.log = lambda msg: logging.getLogger('document.ftp').info(msg)
ftpserver.logline = lambda msg: None
ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg)
ftpserver.logerror = lambda msg: logging.getLogger('document.ftp').error(msg)
ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
ftpd.serve_forever()
if HOST.lower() == 'none':
netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Server FTP Not Started\n")
logging.getLogger('document.ftp').info("\n Server FTP Not Started\n")
else:
netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Serving FTP on %s:%s\n" % (HOST, PORT))
logging.getLogger('document.ftp').info("\n Serving FTP on %s:%s\n" % (HOST, PORT))
ds = ftp_server()
ds.daemon = True
ds.start()

4
addons/document_webdav/webdav_view.xml
View File

@ -77,7 +77,7 @@
<field name="inherit_id" ref="document.view_document_directory_form" />
<field name="type">form</field>
<field name="arch" type="xml">
<page string="Dynamic context" position="after" version="7.0">
<xpath expr="/form/notebook/page[@string='Dynamic context']" position="after" version="7.0">
<page string="WebDAV properties">
<label string="These properties will be added to WebDAV requests" colspan="4" />
@ -97,7 +97,7 @@
</form>
</field>
</page>
</page>
</xpath>
</field>
</record>