Merge lp:~openerp-dev/openobject-server/trunk-bug-802976-nch into lp:openobject-server

[Naresh(OpenERP)]

[Naresh(OpenERP) (nch-openerp)]

client branch needed to merge is :lp:~openerp-dev/openobject-client/trunk-bug-802976-nch

[Vo Minh Thu (thu)]

As you modified get_filters, please make sure it doesn't break any calling functions (in the server or the clients).

In the server, it is called by create_or_replace, which is now broken.

review: Needs Fixing

[Naresh(OpenERP) (nch-openerp)]

Hello,

I dont think it should break ! I just added the missing domain.

can you give me a case where it breaks ?

Note: you need to merge the client branch too lp:~openerp-dev/openobject-client/trunk-bug-802976-nch
to get the desired results.

Thanks,

[Vo Minh Thu (thu)]

create_or_replace will modify the first filter among the filters returned by get_filters. You changed get_filters so it returns both (when available) user-specific and global filters. This means that when you save a filter for a specific user, you might write the global one instead.

[Naresh(OpenERP) (nch-openerp)]

it will only update if the old and the new name matches

[Naresh(OpenERP) (nch-openerp)]

see the variable "matching_filters"

[Vo Minh Thu (thu)]

A filter is uniquely identified by a name, user id, and model. This means matching_filter can contain two filters with the same name but one for a specific user (user id not null) and one global (user id is null).

Then create_or_update writes the first one, but you don't know which one.

[Vo Minh Thu (thu)]

(Actually, it can contain more than two filters: many filters with a null user id will be considered to be different by postgres.)

[lp:~openerp-dev/openobject-server/trunk-bug-802976-nch]

3486. By Naresh(OpenERP) on 2011-06-29

[FIX/IMP]:removed the call to get_filters and refactored the code using search with order by user_id, so the not null user id will be first

[Naresh(OpenERP) (nch-openerp)]

removed the call to get_filters and re-factored the code using search with order by user_id, so the not null user id will be first.

[lp:~openerp-dev/openobject-server/trunk-bug-802976-nch]

3487. By Naresh(OpenERP) on 2011-06-29

[REF]: removed unused variable

[Vo Minh Thu (thu)]

I thought it was good but it is not...

If you have a global filter, when you create a user-specific filter with the same name, the global one is overwritten, making it user-specific. So after that there is no more the global filter.

Probably leaving out the case

  or ('user_id','=',False)

in the domain should do the trick.

review: Needs Fixing

[Naresh(OpenERP) (nch-openerp)]

> I thought it was good but it is not...
>
> If you have a global filter, when you create a user-specific filter with the
> same name, the global one is overwritten, making it user-specific. So after
> that there is no more the global filter.
>
> Probably leaving out the case
>
> or ('user_id','=',False)
>
> in the domain should do the trick.

Hello,

If we do so then we are back to the position from where we begin.... :)

instead we can just Only the user_specific filters.if any !

nch@nch-laptop:~/workspace/OpenERP2011/rdtools/server/trunk-bug-802976-nch$ bzr diff
=== modified file 'openerp/addons/base/ir/ir_filters.py'
--- openerp/addons/base/ir/ir_filters.py 2011-06-29 11:36:36 +0000
+++ openerp/addons/base/ir/ir_filters.py 2011-06-30 06:29:45 +0000
@@ -39,13 +39,19 @@
         return my_acts

     def create_or_replace(self, cr, uid, vals, context=None):
+ ## Search all filters i.e global and user_specific matching the
+ ## new filter name order by user_id so that not null values
+ ## will be at first.
         filter_domain = [('name', '=', vals['name'].lower()),
                          ('model_id','=', vals['model_id']),
                          '|',('user_id','=',uid),('user_id','=',False)]
         filter_ids = self.search(cr, uid, filter_domain, order='user_id', context=context)
+ ## Only update the user_specific filters.
         if filter_ids:
- self.write(cr, uid, filter_ids[0], vals, context)
- return False
+ filter_rec = self.browse(cr, uid, filter_ids[0], context)
+ if filter_rec.user_id:
+ self.write(cr, uid, filter_ids[0], vals, context)
+ return False
         return self.create(cr, uid, vals, context)

     def _auto_init(self, cr, context={}):

[lp:~openerp-dev/openobject-server/trunk-bug-802976-nch]

3488. By Vo Minh Thu on 2011-09-22

[MERGE] merged trunk.

[Vo Minh Thu (thu)]

We have to go a bit further in the changes.

We agree to let users see both their own filters and the so-called global ones, i.e. where the user_id is null.

We want a constraint: for all filters selected on some user_id or null, model id, filter name, we must have at most one filter.

We use a ir rule to restrict access (for regular user) to unlink/write/create, so they can only create non-global filters.

For the above constraint to be user friendly, we might add some manual warnings instead of relying on the ORM to throw (unfriendly) errors.

review: Needs Fixing

[Vo Minh Thu (thu)]

The above changes mean that some addons which create global filters (knowing they would be hidden) will have to create user-specific filters instead.

[lp:~openerp-dev/openobject-server/trunk-bug-802976-nch]

3489. By Naresh(OpenERP) on 2011-10-05

[MERGE FROM TRUNK]

3490. By Naresh(OpenERP) on 2011-10-05

[MERGE FROM TRUNK]

3491. By Naresh(OpenERP) on 2011-11-09

[MERGE FROM TRUNK]

Unmerged revisions

3491. By Naresh(OpenERP) on 2011-11-09

[MERGE FROM TRUNK]

3490. By Naresh(OpenERP) on 2011-10-05

[MERGE FROM TRUNK]

3489. By Naresh(OpenERP) on 2011-10-05

[MERGE FROM TRUNK]

3488. By Vo Minh Thu on 2011-09-22

[MERGE] merged trunk.

3487. By Naresh(OpenERP) on 2011-06-29

[REF]: removed unused variable

3486. By Naresh(OpenERP) on 2011-06-29

[FIX/IMP]:removed the call to get_filters and refactored the code using search with order by user_id, so the not null user id will be first

3485. By Naresh(OpenERP) on 2011-06-29

[FIX]:ir_filters: filters created with user_id as False should show that filter to all user

=== modified file 'openerp/addons/base/ir/ir_filters.py'
--- openerp/addons/base/ir/ir_filters.py	2011-08-06 00:50:46 +0000
+++ openerp/addons/base/ir/ir_filters.py	2011-11-09 07:19:24 +0000
@@ -39,17 +39,17 @@
         return super(ir_filters, self).copy(cr, uid, id, default, context)
    
     def get_filters(self, cr, uid, model):
-        act_ids = self.search(cr,uid,[('model_id','=',model),('user_id','=',uid)])
+        act_ids = self.search(cr,uid,[('model_id','=',model),'|',('user_id','=',uid),('user_id','=',False)])
         my_acts = self.read(cr, uid, act_ids, ['name', 'domain','context'])
         return my_acts
 
     def create_or_replace(self, cr, uid, vals, context=None):
-        filter_id = None
-        lower_name = vals['name'].lower()
-        matching_filters = [x for x in self.get_filters(cr, uid, vals['model_id'])
-                                if x['name'].lower() == lower_name]
-        if matching_filters:
-            self.write(cr, uid, matching_filters[0]['id'], vals, context)
+        filter_domain = [('name', '=', vals['name'].lower()),
+                         ('model_id','=', vals['model_id']),
+                         '|',('user_id','=',uid),('user_id','=',False)]
+        filter_ids = self.search(cr, uid, filter_domain, order='user_id', context=context)
+        if filter_ids:
+            self.write(cr, uid, filter_ids[0], vals, context)
             return False
         return self.create(cr, uid, vals, context)