~crass/tryton/server

« back to all changes in this revision

Viewing changes to trytond/ir/ui/menu.py

  • Committer: Mathias Behrle
  • Date: 2013-11-24 16:28:54 UTC
  • Revision ID: git-v1:182d6cce169eab1682eeacbad4323efa1136a1a0
MergingĀ upstreamĀ versionĀ 3.0.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
78
78
            ondelete='CASCADE')
79
79
    groups = fields.Many2Many('ir.ui.menu-res.group',
80
80
       'menu', 'group', 'Groups')
81
 
    complete_name = fields.Function(fields.Char('Complete Name',
82
 
        order_field='name'), 'get_rec_name', searcher='search_rec_name')
 
81
    complete_name = fields.Function(fields.Char('Complete Name'),
 
82
        'get_rec_name', searcher='search_rec_name')
83
83
    icon = fields.Selection('list_icons', 'Icon', translate=False)
84
84
    action = fields.Function(fields.Reference('Action',
85
85
            selection=[
101
101
                    'not allowed to contain "%s".' % SEPARATOR),
102
102
                })
103
103
 
 
104
    @classmethod
 
105
    def order_complet_name(cls, tables):
 
106
        return cls.name.convert_order('name', tables, cls)
 
107
 
104
108
    @staticmethod
105
109
    def default_icon():
106
110
        return 'tryton-open'
163
167
 
164
168
    @classmethod
165
169
    def search(cls, domain, offset=0, limit=None, order=None, count=False,
166
 
            query_string=False):
 
170
            query=False):
167
171
        menus = super(UIMenu, cls).search(domain, offset=offset, limit=limit,
168
 
                order=order, count=False, query_string=query_string)
169
 
        if query_string:
 
172
                order=order, count=False, query=query)
 
173
        if query:
170
174
            return menus
171
175
 
172
176
        if menus:
262
266
 
263
267
    menu = fields.Many2One('ir.ui.menu', 'Menu', required=True,
264
268
        ondelete='CASCADE')
265
 
    sequence = fields.Integer('Sequence',
266
 
        order_field='(%(table)s.sequence IS NOT NULL) %(order)s, '
267
 
        '%(table)s.sequence %(order)s')
 
269
    sequence = fields.Integer('Sequence')
268
270
    user = fields.Many2One('res.user', 'User', required=True,
269
271
        ondelete='CASCADE')
270
272
 
282
284
            ]
283
285
 
284
286
    @staticmethod
 
287
    def order_sequence(tables):
 
288
        table, _ = tables[None]
 
289
        return [table.sequence == None, table.sequence]
 
290
 
 
291
    @staticmethod
285
292
    def default_user():
286
293
        return Transaction().user
287
294