From a06cc7dead61774b357794408a80e4f6bcc7dc78 Mon Sep 17 00:00:00 2001 From: Bertrand Chenal Date: Sun, 16 Dec 2007 00:53:45 +0100 Subject: [PATCH 1/4] Added hgignore file --- .hgignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .hgignore diff --git a/.hgignore b/.hgignore new file mode 100644 index 0000000000..710e137dfc --- /dev/null +++ b/.hgignore @@ -0,0 +1,4 @@ +# use glob syntax. +syntax: glob +*.pyc +*~ \ No newline at end of file From 3ad40e1e6aab62d3c656ab108b576b4dcc6a882f Mon Sep 17 00:00:00 2001 From: Bertrand Chenal Date: Sun, 16 Dec 2007 00:54:08 +0100 Subject: [PATCH 2/4] Remove plurals in classes names --- trytond/init.sql | 44 +++++++++--------- trytond/res/users.py | 56 +++++++++++----------- trytond/res/users.xml | 106 +++++++++++++++++++++--------------------- 3 files changed, 103 insertions(+), 103 deletions(-) diff --git a/trytond/init.sql b/trytond/init.sql index 817784fbfc..96eb9ea7ff 100644 --- a/trytond/init.sql +++ b/trytond/init.sql @@ -118,7 +118,7 @@ CREATE TABLE ir_ui_menu ( select setval('ir_ui_menu_id_seq', 2); --------------------------------- --- Res users +-- Res user --------------------------------- -- level: @@ -126,7 +126,7 @@ select setval('ir_ui_menu_id_seq', 2); -- 1 RESTRICT TO GROUP -- 2 PUBLIC -CREATE TABLE res_users ( +CREATE TABLE res_user ( id serial NOT NULL, name varchar(64) not null, active boolean default True, @@ -136,32 +136,32 @@ CREATE TABLE res_users ( action_id int, primary key(id) ); -alter table res_users add constraint res_users_login_uniq unique (login); +alter table res_user add constraint res_user_login_uniq unique (login); -insert into res_users (id,login,password,name,action_id,active) values (1,'root',NULL,'Root',NULL,False); -select setval('res_users_id_seq', 2); +insert into res_user (id,login,password,name,action_id,active) values (1,'root',NULL,'Root',NULL,False); +select setval('res_user_id_seq', 2); -CREATE TABLE res_groups ( +CREATE TABLE res_group ( id serial NOT NULL, name varchar(32) NOT NULL, primary key(id) ); -create table res_roles ( +create table res_role ( id serial NOT NULL, - parent_id int references res_roles on delete set null, + parent_id int references res_role on delete set null, name varchar(32) NOT NULL, primary key(id) ); -CREATE TABLE res_roles_users_rel ( - uid integer NOT NULL references res_users on delete cascade, - rid integer NOT NULL references res_roles on delete cascade +CREATE TABLE res_role_user_rel ( + uid integer NOT NULL references res_user on delete cascade, + rid integer NOT NULL references res_role on delete cascade ); -CREATE TABLE res_groups_users_rel ( - uid integer NOT NULL references res_users on delete cascade, - gid integer NOT NULL references res_groups on delete cascade +CREATE TABLE res_group_user_rel ( + uid integer NOT NULL references res_user on delete cascade, + gid integer NOT NULL references res_group on delete cascade ); --------------------------------- @@ -204,7 +204,7 @@ create table wkf_transition trigger_expr_id varchar(128) default NULL, signal varchar(64) default null, - role_id int references res_roles on delete set null, + role_id int references res_role on delete set null, primary key(id) ); @@ -241,7 +241,7 @@ create table wkf_logs id serial, res_type varchar(128) not null, res_id int not null, - uid int references res_users on delete set null, + uid int references res_user on delete set null, act_id int references wkf_activity on delete set null, time time not null, info varchar(128) default NULL, @@ -254,10 +254,10 @@ create table wkf_logs CREATE TABLE ir_module_category ( id serial NOT NULL, - create_uid integer references res_users on delete set null, + create_uid integer references res_user on delete set null, create_date timestamp without time zone, write_date timestamp without time zone, - write_uid integer references res_users on delete set null, + write_uid integer references res_user on delete set null, parent_id integer REFERENCES ir_module_category ON DELETE SET NULL, name character varying(128) NOT NULL, primary key(id) @@ -266,10 +266,10 @@ CREATE TABLE ir_module_category ( CREATE TABLE ir_module_module ( id serial NOT NULL, - create_uid integer references res_users on delete set null, + create_uid integer references res_user on delete set null, create_date timestamp without time zone, write_date timestamp without time zone, - write_uid integer references res_users on delete set null, + write_uid integer references res_user on delete set null, website character varying(256), name character varying(128) NOT NULL, author character varying(128), @@ -286,10 +286,10 @@ ALTER TABLE ir_module_module add constraint name_uniq unique (name); CREATE TABLE ir_module_module_dependency ( id serial NOT NULL, - create_uid integer references res_users on delete set null, + create_uid integer references res_user on delete set null, create_date timestamp without time zone, write_date timestamp without time zone, - write_uid integer references res_users on delete set null, + write_uid integer references res_user on delete set null, name character varying(128), version_pattern character varying(128) default NULL, module_id integer REFERENCES ir_module_module ON DELETE cascade, diff --git a/trytond/res/users.py b/trytond/res/users.py index 9870921460..1c573a729c 100644 --- a/trytond/res/users.py +++ b/trytond/res/users.py @@ -1,11 +1,11 @@ -"Users" +"User" from trytond.osv import fields, OSV, ExceptOSV #from trytond.tools import Cache -class Groups(OSV): - "Groups" - _name = "res.groups" +class Group(OSV): + "Group" + _name = "res.group" _description = __doc__ _columns = { 'name': fields.Char('Group Name', size=64, required=True), @@ -26,28 +26,28 @@ class Groups(OSV): if vals['name'].startswith('-'): raise ExceptOSV('Error', 'The name of the group can not start with "-"') - res = super(Groups, self).write(cursor, user, ids, vals, + res = super(Group, self).write(cursor, user, ids, vals, context=context) # Restart the cache on the company_get method self.pool.get('ir.rule').domain_get() return res -Groups() +Group() -class Roles(OSV): - "Roles" - _name = "res.roles" +class Role(OSV): + "Role" + _name = "res.role" _description = __doc__ _columns = { 'name': fields.Char('Role Name', size=64, required=True), - 'parent_id': fields.Many2One('res.roles', 'Parent', select=True), - 'child_id': fields.One2Many('res.roles', 'parent_id', 'Childs') + 'parent_id': fields.Many2One('res.role', 'Parent', select=True), + 'child_id': fields.One2Many('res.role', 'parent_id', 'Childs') } def check_recursion(self, cursor, user, ids, parent=None): "Check for recursion" - return super(Roles, self).check_recursion(cursor, user, ids, + return super(Role, self).check_recursion(cursor, user, ids, parent=parent) _constraints = [ @@ -55,12 +55,12 @@ class Roles(OSV): ['parent_id']) ] -Roles() +Role() -class Users(OSV): - "Users" - _name = "res.users" +class User(OSV): + "User" + _name = "res.user" _log_access = False _description = __doc__ _columns = { @@ -72,9 +72,9 @@ class Users(OSV): 'active': fields.Boolean('Active'), 'action_id': fields.Many2One('ir.actions.actions', 'Home Action'), 'menu_id': fields.Many2One('ir.actions.actions', 'Menu Action'), - 'groups_id': fields.Many2Many('res.groups', 'res_groups_users_rel', - 'uid', 'gid', 'Groups'), - 'roles_id': fields.Many2Many('res.roles', 'res_roles_users_rel', + 'groups_id': fields.Many2Many('res.group', 'res_group_user_rel', + 'uid', 'gid', 'Groups'), + 'roles_id': fields.Many2Many('res.role', 'res_role_user_rel', 'uid', 'rid', 'Roles'), #'company_id': fields.Many2One('res.company', 'Company'), 'rule_groups': fields.Many2Many('ir.rule.group', 'user_rule_group_rel', @@ -90,15 +90,15 @@ class Users(OSV): 'active' : lambda *a: 1, } # def company_get(self, cursor, user, uid2): -# company_id = self.pool.get('res.users').browse(cursor, user, +# company_id = self.pool.get('res.user').browse(cursor, user, # user).company_id.id # return company_id # company_get = Cache()(company_get) def write(self, cursor, user, ids, vals, context=None): - res = super(Users, self).write(cursor, user, ids, vals, context=context) + res = super(User, self).write(cursor, user, ids, vals, context=context) + # Restart the cache for company_get and domain_get method # self.company_get() - # Restart the cache on the company_get method self.pool.get('ir.rule').domain_get() return res @@ -109,7 +109,7 @@ class Users(OSV): 'as it is used internally for resources\n' \ 'created by Tiny ERP ' \ '(updates, module installation, ...)') - return super(Users, self).unlink(cursor, user, ids, context=context) + return super(User, self).unlink(cursor, user, ids, context=context) def name_search(self, cursor, user, name='', args=None, operator='ilike', context=None, limit=80): @@ -129,15 +129,15 @@ class Users(OSV): default = {} login = self.read(cursor, user, obj_id, ['login'])['login'] default.update({'login': login+' (copy)'}) - return super(Users, self).copy(cursor, user, obj_id, default, + return super(User, self).copy(cursor, user, obj_id, default, context=context) -Users() +User() -class Groups2(Groups): +class Group2(Group): _columns = { - 'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', + 'users': fields.many2many('res.user', 'res_group_user_rel', 'gid', 'uid', 'Users'), } -Groups2() +Group2() diff --git a/trytond/res/users.xml b/trytond/res/users.xml index 71330214fa..a884aba5d8 100644 --- a/trytond/res/users.xml +++ b/trytond/res/users.xml @@ -1,10 +1,10 @@ - + admin - + admin admin Administrator @@ -13,9 +13,9 @@ - - res.users.form - res.users + + res.user.form + res.user form
@@ -42,9 +42,9 @@
- - res.users.tree - res.users + + res.user.tree + res.user tree @@ -53,31 +53,31 @@ - + Users ir.actions.act_window - res.users + res.user form + id="act_user_form_view1"> tree - - + + + id="act_user_form_view2"> form - - + + - - res.groups.form - res.groups + action="act_user_form" id="menu_user_form"/> + + res.group.form + res.group form
@@ -95,9 +95,9 @@
- - res.groups.tree - res.groups + + res.group.tree + res.group tree @@ -105,31 +105,31 @@ - + Groups ir.actions.act_window - res.groups + res.group form + id="act_group_form_view1"> tree - - + + + id="act_group_form_view2"> form - - + + - - res.roles.form - res.roles + action="act_group_form" id="menu_group_form"/> + + res.role.form + res.role form
@@ -138,9 +138,9 @@
- - res.roles.tree - res.roles + + res.role.tree + res.role tree parent_id @@ -149,42 +149,42 @@ - + Roles ir.actions.act_window - res.roles + res.role form + id="act_role_form_view1"> tree - - + + + id="act_role_form_view2"> form - - + + - + Roles ir.actions.act_window - res.roles + res.role tree + id="act_role_form_view3"> tree - - + + + action="act_role_form" id="menu_role_form"/> + action="act_role_tree" id="menu_role_tree"/> From 2648bd1ead281afb8001d2eb795b597971aa8984 Mon Sep 17 00:00:00 2001 From: Bertrand Chenal Date: Mon, 17 Dec 2007 23:34:43 +0100 Subject: [PATCH 3/4] Removed plurals on user, role and group --- trytond/ir/cron.py | 2 +- trytond/ir/model.py | 6 +++--- trytond/ir/property.py | 2 +- trytond/ir/rule.py | 14 +++++++------- trytond/ir/ui/menu.py | 4 ++-- trytond/ir/ui/view.py | 2 +- trytond/ir/values.py | 6 +++--- trytond/osv/orm.py | 8 ++++---- trytond/res/request.py | 8 ++++---- trytond/security.py | 4 ++-- trytond/tools/convert.py | 2 +- trytond/tools/translate.py | 6 +++--- trytond/trytond.py | 10 +++++----- trytond/web_service/db.py | 2 +- trytond/wkf_service/wkf_expr.py | 4 ++-- trytond/workflow/workflow.py | 2 +- 16 files changed, 41 insertions(+), 41 deletions(-) diff --git a/trytond/ir/cron.py b/trytond/ir/cron.py index ab065ab1a1..b904a4a7b2 100644 --- a/trytond/ir/cron.py +++ b/trytond/ir/cron.py @@ -29,7 +29,7 @@ class Cron(OSV, Agent): _description = __doc__ _columns = { 'name': fields.char('Name', size=60, required=True), - 'user_id': fields.many2one('res.users', 'User', required=True), + 'user_id': fields.many2one('res.user', 'User', required=True), 'active': fields.boolean('Active'), 'interval_number': fields.integer('Interval Number'), 'interval_type': fields.selection( [ diff --git a/trytond/ir/model.py b/trytond/ir/model.py index 3f5bb9a2b2..718088f222 100644 --- a/trytond/ir/model.py +++ b/trytond/ir/model.py @@ -37,7 +37,7 @@ class ModelFields(OSV): 'ttype': fields.char('Field Type', size=64), 'relate': fields.boolean('Click and Relate'), - 'groups': fields.many2many('res.groups', 'ir_model_fields_group_rel', + 'groups': fields.many2many('res.group', 'ir_model_fields_group_rel', 'field_id', 'group_id', 'Groups'), 'group_name': fields.char('Group Name', size=128), 'view_load': fields.boolean('View Auto-Load'), @@ -60,7 +60,7 @@ class ModelAccess(OSV): _columns = { 'name': fields.char('Name', size=64, required=True), 'model_id': fields.many2one('ir.model', 'Model', required=True), - 'group_id': fields.many2one('res.groups', 'Group'), + 'group_id': fields.many2one('res.group', 'Group'), 'perm_read': fields.boolean('Read Access'), 'perm_write': fields.boolean('Write Access'), 'perm_create': fields.boolean('Create Access'), @@ -77,7 +77,7 @@ class ModelAccess(OSV): 'FROM ir_model_access a ' 'JOIN ir_model m ' 'ON (a.model_id=m.id) ' - 'JOIN res_groups_users_rel gu ' + 'JOIN res_group_user_rel gu ' 'ON (gu.gid = a.group_id) ' 'WHERE m.model = %s AND gu.uid = %s', (model_name, user,)) row = cursor.fetchall() diff --git a/trytond/ir/property.py b/trytond/ir/property.py index 4fad2e915c..adaf90846e 100644 --- a/trytond/ir/property.py +++ b/trytond/ir/property.py @@ -118,7 +118,7 @@ class Property(OSV): default_val = self.browse(cursor, user, default_id[0], context=context).value -# company_id = obj.pool.get('res.users').company_get(cursor, user, user) +# company_id = obj.pool.get('res.user').company_get(cursor, user, user) res = False if (val != default_val): res = self.create(cursor, user, { diff --git a/trytond/ir/rule.py b/trytond/ir/rule.py index c58453d651..24ac1b1a0f 100644 --- a/trytond/ir/rule.py +++ b/trytond/ir/rule.py @@ -17,9 +17,9 @@ class RuleGroup(OSV): "or it needs to be put on a group or user"), 'rules': fields.one2many('ir.rule', 'rule_group', 'Tests', help="The rule is satisfied if at least one test is True"), - 'groups': fields.many2many('res.groups', 'group_rule_group_rel', + 'groups': fields.many2many('res.group', 'group_rule_group_rel', 'rule_group_id', 'group_id', 'Groups'), - 'users': fields.many2many('res.users', 'user_rule_group_rel', + 'users': fields.many2many('res.user', 'user_rule_group_rel', 'rule_group_id', 'user_id', 'Users'), } _order = 'model_id, global DESC' @@ -89,7 +89,7 @@ class Rule(OSV): return res res = [("False", "False"), ("True", "True"), ("user.id", "User")] - res += get('res.users', level=1, + res += get('res.user', level=1, recur=['many2one'], root_tech='user', root='User') return res @@ -125,7 +125,7 @@ class Rule(OSV): "WHERE user_id = %d " \ "UNION SELECT rule_group_id " \ "FROM group_rule_group_rel g_rel " \ - "JOIN res_groups_users_rel u_rel " \ + "JOIN res_group_user_rel u_rel " \ "ON (g_rel.group_id = u_rel.gid) " \ "WHERE u_rel.uid = %d) " "OR g.global)", (model_name, user, user)) @@ -140,12 +140,12 @@ class Rule(OSV): if rule.operator in ('in', 'child_of'): dom = eval("[('%s', '%s', [%s])]" % \ (rule.field_id.name, rule.operator, rule.operand), - {'user': self.pool.get('res.users').browse(cursor, 1, + {'user': self.pool.get('res.user').browse(cursor, 1, user), 'time': time}) else: dom = eval("[('%s', '%s', %s)]" % \ (rule.field_id.name, rule.operator, rule.operand), - {'user': self.pool.get('res.users').browse(cursor, 1, + {'user': self.pool.get('res.user').browse(cursor, 1, user), 'time': time}) if rule.rule_group['global']: @@ -195,7 +195,7 @@ class Rule(OSV): AND (g.id IN (SELECT rule_group_id FROM user_rule_group_rel WHERE user_id = %d UNION SELECT rule_group_id FROM group_rule_group_rel g_rel - JOIN res_groups_users_rel u_rel + JOIN res_group_user_rel u_rel ON g_rel.group_id = u_rel.gid WHERE u_rel.user = %d))""", (model_name, user, user)) if not cursor.fetchall(): diff --git a/trytond/ir/ui/menu.py b/trytond/ir/ui/menu.py index 3c1d83c7c7..042422224f 100644 --- a/trytond/ir/ui/menu.py +++ b/trytond/ir/ui/menu.py @@ -143,7 +143,7 @@ class UIMenu(OSV): def search(self, cursor, user, args, offset=0, limit=2000, order=None, context=None, count=False): - res_user_obj = self.pool.get('res.users') + res_user_obj = self.pool.get('res.user') if context is None: context = {} ids = super(UIMenu, self).search(cursor, user, args, offset, limit, @@ -235,7 +235,7 @@ class UIMenu(OSV): 'sequence': fields.integer('Sequence'), 'child_id' : fields.one2many('ir.ui.menu', 'parent_id','Child ids'), 'parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', select=True), - 'groups_id': Many2ManyUniq('res.groups', 'ir_ui_menu_group_rel', + 'groups_id': Many2ManyUniq('res.group', 'ir_ui_menu_group_rel', 'menu_id', 'gid', 'Groups'), 'complete_name': fields.function(_get_full_name, method=True, string='Complete Name', type='char', size=128), diff --git a/trytond/ir/ui/view.py b/trytond/ir/ui/view.py index f1186bd81a..d28f5807ee 100644 --- a/trytond/ir/ui/view.py +++ b/trytond/ir/ui/view.py @@ -53,7 +53,7 @@ class ViewShortcut(OSV): 'name': fields.char('Shortcut Name', size=64, required=True), 'res_id': fields.integer('Resource Ref.', required=True), 'sequence': fields.integer('Sequence'), - 'user_id': fields.many2one('res.users', 'User Ref.', required=True, + 'user_id': fields.many2one('res.user', 'User Ref.', required=True, ondelete='cascade'), 'resource': fields.char('Resource Name', size=64, required=True) } diff --git a/trytond/ir/values.py b/trytond/ir/values.py index f6f46caec5..a49bb97aed 100644 --- a/trytond/ir/values.py +++ b/trytond/ir/values.py @@ -45,7 +45,7 @@ class Values(OSV): fnct_inv=_value_pickle, method=True, type='text', string='Meta Datas'), 'res_id': fields.integer('Resource ID'), - 'user_id': fields.many2one('res.users', 'User', ondelete='cascade'), + 'user_id': fields.many2one('res.user', 'User', ondelete='cascade'), #TODO add in company module @@ -111,7 +111,7 @@ class Values(OSV): 'user_id': preserve_user and user, } # if company: -# cid = self.pool.get('res.users').browse(cursor, user, user, +# cid = self.pool.get('res.user').browse(cursor, user, user, # context={}).company_id.id # vals['company_id'] = cid if res_id: @@ -177,7 +177,7 @@ class Values(OSV): if not result: return [] -# cid = self.pool.get('res.users').browse(cursor, user, user, +# cid = self.pool.get('res.user').browse(cursor, user, user, # context={}).company_id.id cursor.execute('SELECT id, name, value, object, meta, key ' \ 'FROM ir_values ' \ diff --git a/trytond/osv/orm.py b/trytond/osv/orm.py index 6396ed5d18..10687196bc 100644 --- a/trytond/osv/orm.py +++ b/trytond/osv/orm.py @@ -316,10 +316,10 @@ class ORM(object): cursor.commit() if self._log_access: logs = { - 'create_uid': 'INTEGER REFERENCES res_users ' \ + 'create_uid': 'INTEGER REFERENCES res_user ' \ 'ON DELETE SET NULL', 'create_date': 'TIMESTAMP', - 'write_uid': 'INTEGER REFERENCES res_users ' \ + 'write_uid': 'INTEGER REFERENCES res_user ' \ 'ON DELETE SET NULL', 'write_date': 'TIMESTAMP' } @@ -632,11 +632,11 @@ class ORM(object): # FIXME: does not work at all # if self._log_access: # self._columns.update({ -# 'create_uid': fields.many2one('res.users', 'Creation user', +# 'create_uid': fields.many2one('res.user', 'Creation user', # required=True, readonly=True), # 'create_date': fields.datetime('Creation date', required=True, # readonly=True), -# 'write_uid': fields.many2one('res.users', +# 'write_uid': fields.many2one('res.user', # 'Last modification by', readonly=True), # 'write_date': fields.datetime('Last modification date', # readonly=True), diff --git a/trytond/res/request.py b/trytond/res/request.py index 7de3bce35b..e3a07f1354 100644 --- a/trytond/res/request.py +++ b/trytond/res/request.py @@ -31,11 +31,11 @@ class Request(OSV): 'waiting': [('readonly', True)], 'closed': [('readonly', True)], }, required=True), - 'act_from': fields.Many2One('res.users', 'From', required=True, + 'act_from': fields.Many2One('res.user', 'From', required=True, readonly=True, states={ 'closed': [('readonly', True)], }), - 'act_to': fields.Many2One('res.users', 'To', required=True, + 'act_to': fields.Many2One('res.user', 'To', required=True, states={ 'waiting': [('readonly', True)], 'closed': [('readonly', True)], @@ -155,9 +155,9 @@ class RequestHistory(OSV): }, required=True), 'req_id': fields.Many2One('res.request', 'Request', required=True, ondelete='cascade', select=True), - 'act_from': fields.Many2One('res.users', 'From', required=True, + 'act_from': fields.Many2One('res.user', 'From', required=True, readonly=True), - 'act_to': fields.Many2One('res.users', 'To', required=True, states={ + 'act_to': fields.Many2One('res.user', 'To', required=True, states={ 'waiting': [('readonly', True)], }), 'body': fields.Text('Body', states={ diff --git a/trytond/security.py b/trytond/security.py index 6f51d6ec7f..39366ad1b7 100644 --- a/trytond/security.py +++ b/trytond/security.py @@ -5,7 +5,7 @@ _USER_CACHE = {} def login(dbname, loginname, password): cursor = pooler.get_db(dbname).cursor() - cursor.execute('SELECT id FROM res_users ' + cursor.execute('SELECT id FROM res_user ' 'WHERE login = %s and password = %s and active', (loginname.encode('utf-8'), password.encode('utf-8'))) res = cursor.fetchone() @@ -26,7 +26,7 @@ def check(dbname, user, passwd): if _USER_CACHE.has_key(user) and (_USER_CACHE[user]==passwd): return True cursor = pooler.get_db(dbname).cursor() - cursor.execute('SELECT count(*) FROM res_users ' \ + cursor.execute('SELECT count(*) FROM res_user ' \ 'WHERE id = %d AND password = %s', (int(user), passwd)) res = cursor.fetchone()[0] cursor.close() diff --git a/trytond/tools/convert.py b/trytond/tools/convert.py index 970b85fc40..8986930d52 100644 --- a/trytond/tools/convert.py +++ b/trytond/tools/convert.py @@ -471,7 +471,7 @@ class XMLImport(object): if rec.hasAttribute('groups'): g_names = rec.getAttribute('groups').split(',') groups_value = [] - groups_obj = self.pool.get('res.groups') + groups_obj = self.pool.get('res.group') for group in g_names: if group.startswith('-'): group_id = self.id_get(cursor, group[1:]) diff --git a/trytond/tools/translate.py b/trytond/tools/translate.py index 43f49ebb9d..77386ba1fc 100644 --- a/trytond/tools/translate.py +++ b/trytond/tools/translate.py @@ -278,17 +278,17 @@ def trans_load_data(db_name, data, lang, strict=False, lang_name=None): selection = [(x['code'], x['name']) for x in langs] values_obj.set(cursor, user, 'meta', 'lang', 'lang', - [('res.users', False,)], + [('res.user', False,)], False, True, False, meta={ 'type': 'selection', 'string': 'Language', 'selection': selection, }) - user_ids = pool.get('res.users').search(cursor, user, []) + user_ids = pool.get('res.user').search(cursor, user, []) for user_id in user_ids: values_obj.set(cursor, user, 'meta', 'lang', 'lang', - [('res.users', user_id,)], lang, True, False) + [('res.user', user_id,)], lang, True, False) reader = csv.reader(data) # read the first line of the file (it contains columns titles) diff --git a/trytond/trytond.py b/trytond/trytond.py index b11b76ded6..e8e13c3f72 100644 --- a/trytond/trytond.py +++ b/trytond/trytond.py @@ -99,11 +99,11 @@ class TrytonServer(object): "'ir_act_url', " "'ir_ui_view', " "'ir_ui_menu', " - "'res_users', " - "'res_groups', " - "'res_roles', " - "'res_roles_users_rel', " - "'res_groups_users_rel', " + "'res_user', " + "'res_group', " + "'res_role', " + "'res_role_user_rel', " + "'res_group_user_rel', " "'wkf', " "'wkf_activity', " "'wkf_transition', " diff --git a/trytond/web_service/db.py b/trytond/web_service/db.py index 5bb9c0d9c7..1a5b15cc9f 100644 --- a/trytond/web_service/db.py +++ b/trytond/web_service/db.py @@ -59,7 +59,7 @@ class DB(Service): service.actions[db_id]['clean'] = True cursor = sql_db.db_connect(db_name).cursor() cursor.execute('select login, password, name ' \ - 'from res_users ' \ + 'from res_user ' \ 'where login <> \'root\' order by login') service.actions[db_id]['users'] = cursor.dictfetchall() cursor.close() diff --git a/trytond/wkf_service/wkf_expr.py b/trytond/wkf_service/wkf_expr.py index 690e9677da..4fa35c0c6c 100644 --- a/trytond/wkf_service/wkf_expr.py +++ b/trytond/wkf_service/wkf_expr.py @@ -65,9 +65,9 @@ def check(cursor, ident, transition, signal): if transition['role_id']: user = ident[0] serv = netsvc.LocalService('object_proxy') - user_roles = serv.execute_cr(cursor, user, 'res.users', 'read', [user], + user_roles = serv.execute_cr(cursor, user, 'res.user', 'read', [user], ['roles_id'])[0]['roles_id'] - res = res and serv.execute_cr(cursor, user, 'res.roles', 'check', + res = res and serv.execute_cr(cursor, user, 'res.role', 'check', user_roles, transition['role_id']) res = res and eval_expr(cursor, ident, transition['condition']) return res diff --git a/trytond/workflow/workflow.py b/trytond/workflow/workflow.py index 8191cae643..01733fec21 100644 --- a/trytond/workflow/workflow.py +++ b/trytond/workflow/workflow.py @@ -90,7 +90,7 @@ class WorkflowTransition(OSV): 'trigger_model': fields.char('Trigger Type', size=128), 'trigger_expr_id': fields.char('Trigger Expr ID', size=128), 'signal': fields.char('Signal (button Name)', size=64), - 'role_id': fields.many2one('res.roles', 'Role Required'), + 'role_id': fields.many2one('res.role', 'Role Required'), 'condition': fields.char('Condition', required=True, size=128), 'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=1), From 18343121d3d31b2f0d1f2a849cc279e7bd31c74d Mon Sep 17 00:00:00 2001 From: Bertrand Chenal Date: Mon, 17 Dec 2007 23:38:56 +0100 Subject: [PATCH 4/4] Rename file users.py to user.py to keep consistency --- trytond/res/__init__.py | 2 +- trytond/res/{users.py => user.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename trytond/res/{users.py => user.py} (100%) diff --git a/trytond/res/__init__.py b/trytond/res/__init__.py index e9d6604192..4deda13a9b 100644 --- a/trytond/res/__init__.py +++ b/trytond/res/__init__.py @@ -1,3 +1,3 @@ -from users import * +from user import * from lang import * from request import * diff --git a/trytond/res/users.py b/trytond/res/user.py similarity index 100% rename from trytond/res/users.py rename to trytond/res/user.py