Merge lp:~openerp-dev/openerp-web/trunk-calendar-meeting-ptr into lp:openerp-web

[Harry (OpenERP)]

[lp:~openerp-dev/openerp-web/trunk-calendar-meeting-ptr]

3989. By Pariket Trivedi(OpenERP) on 2014-04-25

[IMP]: remove not necessary code.

Unmerged revisions

3989. By Pariket Trivedi(OpenERP) on 2014-04-25

[IMP]: remove not necessary code.

3988. By Pariket Trivedi(OpenERP) on 2014-04-23

[IMP]: add id and remove CalendarView.sidebar.button_add_contact template and remove not necessary code in js

=== modified file 'addons/web_calendar/static/src/js/web_calendar.js'
--- addons/web_calendar/static/src/js/web_calendar.js	2014-04-16 15:15:43 +0000
+++ addons/web_calendar/static/src/js/web_calendar.js	2014-04-25 11:10:28 +0000
@@ -313,59 +313,6 @@
                     firstDay: translate.firstDay,
                 });
 
-            
-                if (this.useContacts) {
-                    //Get my Partner ID
-                    
-                    new instance.web.Model("res.users").query(["partner_id"]).filter([["id", "=",this.dataset.context.uid]]).first()
-                        .done(
-                            function(result) {
-                                var sidebar_items = {};
-                                var filter_value = result.partner_id[0];
-                                var filter_item = {
-                                    value: filter_value,
-                                    label: result.partner_id[1] + _lt(" [Me]"),
-                                    color: self.get_color(filter_value),
-                                    avatar_model: self.avatar_model,
-                                    is_checked: true
-                                };
-
-                                sidebar_items[filter_value] = filter_item ;
-                                filter_item = {
-                                        value: -1,
-                                        label: _lt("Everybody's calendars"),
-                                        color: self.get_color(-1),
-                                        avatar_model: self.avatar_model,
-                                        is_checked: false
-                                    };
-                                sidebar_items[-1] = filter_item ;
-                                //Get my coworkers/contacts
-                                new instance.web.Model("calendar.contacts").query(["partner_id"]).filter([["user_id", "=",self.dataset.context.uid]]).all().then(function(result) {
-                                    _.each(result, function(item) {
-                                        filter_value = item.partner_id[0];
-                                        filter_item = {
-                                            value: filter_value,
-                                            label: item.partner_id[1],
-                                            color: self.get_color(filter_value),
-                                            avatar_model: self.avatar_model,
-                                            is_checked: true
-                                        };
-                                        sidebar_items[filter_value] = filter_item ;
-                                    });
-
-                                    self.all_filters = sidebar_items;
-                                    self.now_filter_ids = $.map(self.all_filters, function(o) { return o.value; });
-                                    
-                                    self.sidebar.filter.events_loaded(self.all_filters);
-                                    self.sidebar.filter.set_filters();
-                                                                        
-                                    self.sidebar.filter.addUpdateButton();
-                                }).done(function () {
-                                    self.$calendar.fullCalendar('refetchEvents');
-                                });
-                            }
-                         );
-                }
                 this.extraSideBar();                
             }
             self.$calendar.fullCalendar(self.get_fc_init_options());
@@ -1417,16 +1364,6 @@
             self.view.all_filters[parseInt(e.target.value)].is_checked = e.target.checked;
             self.view.$calendar.fullCalendar('refetchEvents');
         },
-        addUpdateButton: function() {
-            var self=this;
-            this.$('div.oe_calendar_all_responsibles').append(QWeb.render('CalendarView.sidebar.button_add_contact'));
-            this.$(".add_contacts_link_btn").on('click', function() {
-                self.rpc("/web/action/load", {
-                    action_id: "calendar.action_calendar_contacts"
-                }).then( function(result) { return self.do_action(result); });
-            });
-            
-        },
     });
 
 };

=== modified file 'addons/web_calendar/static/src/xml/web_fullcalendar.xml'
--- addons/web_calendar/static/src/xml/web_fullcalendar.xml	2014-01-10 17:03:33 +0000
+++ addons/web_calendar/static/src/xml/web_fullcalendar.xml	2014-04-25 11:10:28 +0000
@@ -35,7 +35,7 @@
                    <t t-if="(filters_value.value != -1) &amp;&amp; filters_value.avatar_model ">
                        <img t-att-src="'/web/binary/image?model=' + filters_value.avatar_model + '&amp;field=image_small&amp;id=' + filters_value.value"  class="cal_avatar"/>     
                    </t>
-                   <span t-attf-class="cal_opacity underline_color_#{filters_value.color}" ><t t-esc="filters_value.label" /></span>
+                   <span  id="color_filter" t-attf-class="cal_opacity underline_color_#{filters_value.color}" ><t t-esc="filters_value.label" /></span>
                </t>
            </div>
        </div>
@@ -53,13 +53,6 @@
       </t>
     </t>
   </div>
-  
-  <div t-name="CalendarView.sidebar.button_add_contact" class="oe_calendar_buttons_add_contact">
-        <button class='oe_button oe_form_button oe_link add_contacts_link_btn' style='margin-top:10px'>
-            <span class='add_contacts_link'>See Employee's Meeting</span>
-        </button>
-  </div>
-
 
   <div t-name="CalendarView.quick_create" class="oe_calendar_quick_create openerp">