tryton-do/tryton
2
0 Fork 0
Code Issues Pull Requests 2 Actions 2 Packages Projects Releases Wiki Activity

Remove plurals in classes names

Browse Source
This commit is contained in:
Bertrand Chenal committed 2007-12-16 00:54:08 +01:00
1 parent a06cc7dead
commit 3ad40e1e6a
3 files changed
+103 -103
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

trytond/init.sql
+22 -22
View File
@@ -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,
trytond/res/users.py
+28 -28
View File
@@ -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()
trytond/res/users.xml
+53 -53
View File
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<terp>
<data>
<record model="res.groups" id="group_admin">
<record model="res.group" id="group_admin">
<field name="name">admin</field>
</record>
<record model="res.users" id="user_admin">
<record model="res.user" id="user_admin">
<field name="login">admin</field>
<field name="password">admin</field>
<field name="name">Administrator</field>
@@ -13,9 +13,9 @@
<field name="menu_id" ref="ir.act_menu_tree"/>
<field name="groups_id" eval="[(6, 0, [group_admin])]"/>
</record>
<record model="ir.ui.view" id="users_view_form">
<field name="name">res.users.form</field>
<field name="model">res.users</field>
<record model="ir.ui.view" id="user_view_form">
<field name="name">res.user.form</field>
<field name="model">res.user</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="User">
@@ -42,9 +42,9 @@
</form>
</field>
</record>
<record model="ir.ui.view" id="users_view_tree">
<field name="name">res.users.tree</field>
<field name="model">res.users</field>
<record model="ir.ui.view" id="user_view_tree">
<field name="name">res.user.tree</field>
<field name="model">res.user</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Users">
@@ -53,31 +53,31 @@
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="act_users_form">
<record model="ir.actions.act_window" id="act_user_form">
<field name="name">Users</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.users</field>
<field name="res_model">res.user</field>
<field name="view_type">form</field>
</record>
<record model="ir.actions.act_window.view"
id="act_users_form_view1">
id="act_user_form_view1">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="users_view_tree"/>
<field name="act_window_id" ref="act_users_form"/>
<field name="view_id" ref="user_view_tree"/>
<field name="act_window_id" ref="act_user_form"/>
</record>
<record model="ir.actions.act_window.view"
id="act_users_form_view2">
id="act_user_form_view2">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="users_view_form"/>
<field name="act_window_id" ref="act_users_form"/>
<field name="view_id" ref="user_view_form"/>
<field name="act_window_id" ref="act_user_form"/>
</record>
<menuitem name="Administration/Res/"
action="act_users_form" id="menu_users_form"/>
<record model="ir.ui.view" id="groups_view_form">
<field name="name">res.groups.form</field>
<field name="model">res.groups</field>
action="act_user_form" id="menu_user_form"/>
<record model="ir.ui.view" id="group_view_form">
<field name="name">res.group.form</field>
<field name="model">res.group</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Group">
@@ -95,9 +95,9 @@
</form>
</field>
</record>
<record model="ir.ui.view" id="groups_view_tree">
<field name="name">res.groups.tree</field>
<field name="model">res.groups</field>
<record model="ir.ui.view" id="group_view_tree">
<field name="name">res.group.tree</field>
<field name="model">res.group</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Groups">
@@ -105,31 +105,31 @@
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="act_groups_form">
<record model="ir.actions.act_window" id="act_group_form">
<field name="name">Groups</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.groups</field>
<field name="res_model">res.group</field>
<field name="view_type">form</field>
</record>
<record model="ir.actions.act_window.view"
id="act_groups_form_view1">
id="act_group_form_view1">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="groups_view_tree"/>
<field name="act_window_id" ref="act_groups_form"/>
<field name="view_id" ref="group_view_tree"/>
<field name="act_window_id" ref="act_group_form"/>
</record>
<record model="ir.actions.act_window.view"
id="act_groups_form_view2">
id="act_group_form_view2">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="groups_view_form"/>
<field name="act_window_id" ref="act_groups_form"/>
<field name="view_id" ref="group_view_form"/>
<field name="act_window_id" ref="act_group_form"/>
</record>
<menuitem name="Administration/Res/"
action="act_groups_form" id="menu_groups_form"/>
<record model="ir.ui.view" id="roles_view_form">
<field name="name">res.roles.form</field>
<field name="model">res.roles</field>
action="act_group_form" id="menu_group_form"/>
<record model="ir.ui.view" id="role_view_form">
<field name="name">res.role.form</field>
<field name="model">res.role</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Role">
@@ -138,9 +138,9 @@
</form>
</field>
</record>
<record model="ir.ui.view" id="roles_view_tree">
<field name="name">res.roles.tree</field>
<field name="model">res.roles</field>
<record model="ir.ui.view" id="role_view_tree">
<field name="name">res.role.tree</field>
<field name="model">res.role</field>
<field name="type">tree</field>
<field name="field_parent">parent_id</field>
<field name="arch" type="xml">
@@ -149,42 +149,42 @@
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="act_roles_form">
<record model="ir.actions.act_window" id="act_role_form">
<field name="name">Roles</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.roles</field>
<field name="res_model">res.role</field>
<field name="view_type">form</field>
</record>
<record model="ir.actions.act_window.view"
id="act_roles_form_view1">
id="act_role_form_view1">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="roles_view_tree"/>
<field name="act_window_id" ref="act_roles_form"/>
<field name="view_id" ref="role_view_tree"/>
<field name="act_window_id" ref="act_role_form"/>
</record>
<record model="ir.actions.act_window.view"
id="act_roles_form_view2">
id="act_role_form_view2">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="roles_view_form"/>
<field name="act_window_id" ref="act_roles_form"/>
<field name="view_id" ref="role_view_form"/>
<field name="act_window_id" ref="act_role_form"/>
</record>
<record model="ir.actions.act_window" id="act_roles_tree">
<record model="ir.actions.act_window" id="act_role_tree">
<field name="name">Roles</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.roles</field>
<field name="res_model">res.role</field>
<field name="view_type">tree</field>
</record>
<record model="ir.actions.act_window.view"
id="act_roles_form_view3">
id="act_role_form_view3">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="roles_view_tree"/>
<field name="act_window_id" ref="act_roles_tree"/>
<field name="view_id" ref="role_view_tree"/>
<field name="act_window_id" ref="act_role_tree"/>
</record>
<menuitem name="Administration/Res/"
action="act_roles_form" id="menu_roles_form"/>
action="act_role_form" id="menu_role_form"/>
<menuitem name="Administration/Res/"
action="act_roles_tree" id="menu_roles_tree"/>
action="act_role_tree" id="menu_role_tree"/>
</data>
</terp>