parent
25acb93277
commit
d01868ed74
|
@ -20,9 +20,10 @@
|
|||
##############################################################################
|
||||
|
||||
from osv import osv, fields
|
||||
import nodes
|
||||
from tools import config
|
||||
|
||||
import nodes
|
||||
|
||||
class document_davdir(osv.osv):
|
||||
_inherit = 'document.directory'
|
||||
|
||||
|
@ -64,8 +65,6 @@ class document_davdir(osv.osv):
|
|||
"""
|
||||
return (nodes.node_database(context=ncontext), uri)
|
||||
|
||||
document_davdir()
|
||||
|
||||
class dav_dir_property(osv.osv):
|
||||
""" Arbitrary WebDAV properties, attached to document.directories.
|
||||
|
||||
|
@ -96,8 +95,6 @@ class dav_dir_property(osv.osv):
|
|||
'do_subst': False,
|
||||
}
|
||||
|
||||
dav_dir_property()
|
||||
|
||||
class dav_file_property(osv.osv):
|
||||
""" Arbitrary WebDAV properties, attached to ir.attachments.
|
||||
|
||||
|
@ -126,7 +123,5 @@ class dav_file_property(osv.osv):
|
|||
'do_subst': False,
|
||||
}
|
||||
|
||||
dav_file_property()
|
||||
|
||||
#eof
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -27,10 +27,18 @@ import urllib
|
|||
import uuid
|
||||
from openerp import SUPERUSER_ID
|
||||
|
||||
try:
|
||||
from tools.dict_tools import dict_filter
|
||||
except ImportError:
|
||||
from document.dict_tools import dict_filter
|
||||
def dict_filter(srcdic, keys, res=None):
|
||||
''' Return a copy of srcdic that has only keys set.
|
||||
If any of keys are missing from srcdic, the result won't have them,
|
||||
either.
|
||||
@param res If given, result will be updated there, instead of a new dict.
|
||||
'''
|
||||
if res is None:
|
||||
res = {}
|
||||
for k in keys:
|
||||
if k in srcdic:
|
||||
res[k] = srcdic[k]
|
||||
return res
|
||||
|
||||
class node_acl_mixin(object):
|
||||
def _get_dav_owner(self, cr):
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
<field eval="0" name="ressource_tree"/>
|
||||
<field name="user_id" eval="False"/>
|
||||
<field name="company_id" ref="base.main_company"/>
|
||||
<field name="storage_id" ref="document.storage_default"/>
|
||||
<field name="type">directory</field>
|
||||
<field eval="[(6,0,[])]" name="group_ids"/>
|
||||
<field name="name">principals</field>
|
||||
|
@ -27,7 +26,6 @@
|
|||
<field name="user_id" eval="False"/>
|
||||
<field name="company_id" ref="base.main_company"/>
|
||||
<field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
|
||||
<field name="storage_id" ref="document.storage_default"/>
|
||||
<field name="type">directory</field>
|
||||
<field eval="[(6,0,[])]" name="group_ids"/>
|
||||
<field name="name">groups</field>
|
||||
|
@ -39,7 +37,6 @@
|
|||
<field eval="0" name="ressource_tree"/>
|
||||
<field name="company_id" ref="base.main_company"/>
|
||||
<field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
|
||||
<field name="storage_id" ref="document.storage_default"/>
|
||||
<field name="type">directory</field>
|
||||
<field eval="[(6,0,[])]" name="group_ids"/>
|
||||
<field name="name">resources</field>
|
||||
|
@ -52,7 +49,6 @@
|
|||
<field name="resource_field" ref="base.field_res_users_login"/>
|
||||
<field name="company_id" ref="base.main_company"/>
|
||||
<field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
|
||||
<field name="storage_id" ref="document.storage_default"/>
|
||||
<field name="type">ressource</field>
|
||||
<field name="ressource_type_id" ref="base.model_res_users"/>
|
||||
<field eval="[(6,0,[])]" name="group_ids"/>
|
||||
|
@ -66,7 +62,6 @@
|
|||
<field name="resource_field" ref="base.field_res_users_login"/>
|
||||
<field name="company_id" ref="base.main_company"/>
|
||||
<field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
|
||||
<field name="storage_id" ref="document.storage_default"/>
|
||||
<field name="type">ressource</field>
|
||||
<field name="ressource_type_id" ref="base.model_res_users"/>
|
||||
<field eval="[(6,0,[])]" name="group_ids"/>
|
||||
|
@ -78,7 +73,6 @@
|
|||
<field eval="0" name="ressource_tree"/>
|
||||
<field name="company_id" ref="base.main_company"/>
|
||||
<field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
|
||||
<field name="storage_id" ref="document.storage_default"/>
|
||||
<field name="type">directory</field>
|
||||
<field eval="[(6,0,[])]" name="group_ids"/>
|
||||
<field name="name">locations</field>
|
||||
|
|
Loading…
Reference in New Issue