[FIX] calendar: order of calendar contacts

When displaying calendar contacts in calendar view, the contacts
have to be ordered by name.

opw:666397

2 files changed, 7 insertions, 4 deletions

diff --git a/addons/calendar/contacts.py b/addons/calendar/contacts.py
index 375f1988cb4..7a32dc4d1a1 100644
--- a/addons/calendar/contacts.py
+++ b/addons/calendar/contacts.py
@@ -4,12 +4,14 @@
 from openerp.osv import fields, osv
 
 class calendar_contacts(osv.osv):
-    _name = 'calendar.contacts'    
+    _name = 'calendar.contacts'
+    _order = "name"
 
     _columns = {
         'user_id': fields.many2one('res.users','Me'),
         'partner_id': fields.many2one('res.partner','Employee',required=True, domain=[]),
-        'active':fields.boolean('active'),        
+        'active':fields.boolean('active'),
+        'name': fields.related('partner_id', 'display_name', type='char', string='Partner Contact Name', readonly=True),
      }
     _defaults = {
         'user_id': lambda self, cr, uid, ctx: uid,
diff --git a/addons/calendar/static/src/js/base_calendar.js b/addons/calendar/static/src/js/base_calendar.js
index a10395ac548..42beb31aded 100644
--- a/addons/calendar/static/src/js/base_calendar.js
+++ b/addons/calendar/static/src/js/base_calendar.js
@@ -38,7 +38,7 @@ function reload_favorite_list(result) {
             is_checked: true,
             is_remove: false,
         };
-        sidebar_items[filter_value] = filter_item ;
+        sidebar_items[0] = filter_item ;
         
         filter_item = {
                 value: -1,
@@ -50,6 +50,7 @@ function reload_favorite_list(result) {
         sidebar_items[-1] = filter_item ;
         //Get my coworkers/contacts
         new Model("calendar.contacts").query(["partner_id"]).filter([["user_id", "=",self.dataset.context.uid]]).all().then(function(result) {
+            var i = 1;
             _.each(result, function(item) {
                 filter_value = item.partner_id[0];
                 filter_item = {
@@ -59,7 +60,7 @@ function reload_favorite_list(result) {
                     avatar_model: self.avatar_model,
                     is_checked: true
                 };
-                sidebar_items[filter_value] = filter_item ;
+                sidebar_items[i++] = filter_item ;
             });
             self.all_filters = sidebar_items;
             self.now_filter_ids = $.map(self.all_filters, function(o) { return o.value; });