Merge lp:~openerp-dev/openerp-web/trunk-imp-calendar-dragdrop-dka into lp:openerp-web

[Darshan Kalola(OpenERP)]

 Hello,

    i have FIX the following points:
        1 -> if the SO/MO/PO is done, date field is readonly so we cannot change it. but dragging/dropping it in calendar view changes date value, it should not
        2 -> when the record's name field contains more values the breadcrumb is getting expanded, it should cut after 45Char length(approx when it reaches right edge of More button) with ...

Thanks,
Darshan

[lp:~openerp-dev/openerp-web/trunk-imp-calendar-dragdrop-dka]

3941. By Darshan Kalola(OpenERP) on 2014-02-20

[MERGE]sync with trunk.

3942. By Darshan Kalola(OpenERP) on 2014-02-25

[MERGE]sync with trunk and resolve conflicts from web_calendar.

3943. By Darshan Kalola(OpenERP) on 2014-02-28

[MERGE]sync with trunk.

3944. By Darshan Kalola(OpenERP) on 2014-02-28

[IMP]calendar:process invisible modifier.

3945. By Darshan Kalola(OpenERP) on 2014-03-03

[IMP]improved code.

3946. By Darshan Kalola(OpenERP) on 2014-03-31

[MERGE]sync with trunk.

3947. By Darshan Kalola(OpenERP) on 2014-04-08

[MERGE]sync with trunk.

3948. By Darshan Kalola(OpenERP) on 2014-04-11

[MERGE]sync with trunk.

3949. By Darshan Kalola(OpenERP) on 2014-04-15

[MERGE]sync with trunk.

3950. By Darshan Kalola(OpenERP) on 2014-04-21

[MERGE]sync with trunk.

3951. By Darshan Kalola(OpenERP) on 2014-04-23

[MERGE]sync with trunk.

3952. By Darshan Kalola(OpenERP) on 2014-04-23

[MERGE]sync with trunk.

3953. By Darshan Kalola(OpenERP) on 2014-04-24

[MERGE]sync with trunk.

3954. By Darshan Kalola(OpenERP) on 2014-04-29

[MERGE]sync with trunk.

Unmerged revisions

3954. By Darshan Kalola(OpenERP) on 2014-04-29

[MERGE]sync with trunk.

3953. By Darshan Kalola(OpenERP) on 2014-04-24

[MERGE]sync with trunk.

3952. By Darshan Kalola(OpenERP) on 2014-04-23

[MERGE]sync with trunk.

3951. By Darshan Kalola(OpenERP) on 2014-04-23

[MERGE]sync with trunk.

3950. By Darshan Kalola(OpenERP) on 2014-04-21

[MERGE]sync with trunk.

3949. By Darshan Kalola(OpenERP) on 2014-04-15

[MERGE]sync with trunk.

3948. By Darshan Kalola(OpenERP) on 2014-04-11

[MERGE]sync with trunk.

3947. By Darshan Kalola(OpenERP) on 2014-04-08

[MERGE]sync with trunk.

3946. By Darshan Kalola(OpenERP) on 2014-03-31

[MERGE]sync with trunk.

3945. By Darshan Kalola(OpenERP) on 2014-03-03

[IMP]improved code.

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2014-04-23 09:14:14 +0000
+++ addons/web/static/src/css/base.css	2014-04-29 04:41:05 +0000
@@ -1100,6 +1100,11 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+.openerp .oe_application .oe_breadcrumb_item:last-child {
+  max-width: 20em;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 .openerp .oe_application .oe_breadcrumb_title > * {
   display: inline-block;
   overflow: hidden;

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2014-04-23 09:14:14 +0000
+++ addons/web/static/src/css/base.sass	2014-04-29 04:41:05 +0000
@@ -932,6 +932,10 @@
             max-width: 7em
             white-space: nowrap
             text-overflow: ellipsis
+        .oe_breadcrumb_item:last-child
+            max-width: 20em
+            white-space: nowrap
+            text-overflow: ellipsis
         .oe_breadcrumb_title > *
             display: inline-block
             overflow: hidden

=== 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-29 04:41:05 +0000
@@ -103,6 +103,8 @@
             this.$calendar = this.$el.find(".oe_calendar_widget");
 
             this.info_fields = [];
+            this.field_modifiers = [];
+            this.field_attrs_modifiers = [];
 
             /* buttons */
             this.$buttons = $(QWeb.render("CalendarView.buttons", {'widget': this}));
@@ -211,6 +213,30 @@
             for (var fld = 0; fld < fv.arch.children.length; fld++) {
                 this.info_fields.push(fv.arch.children[fld].attrs.name);
             }
+            _.each(this.fields_view.arch.children, function(node) {
+                if (node.attrs) {
+                    modifier = JSON.parse(node.attrs.modifiers || '{}')
+                    if (modifier.invisible == true){
+                         _.each(self.info_fields, function (fieldname) {
+                             if(fieldname == node.attrs.name){
+                                self.info_fields.splice(self.info_fields.indexOf(fieldname), 1);
+                             }
+                         });
+                    }
+                    if (node.attrs.name == self.date_start) 
+                        self.field_attrs_modifiers = modifier['readonly'];
+                }
+            });
+            if (this.fields[this.date_start].states) {
+                var states = [];
+                var res = "";
+                _.each (this.fields[this.date_start].states, function(modifier, state) {
+                    if (modifier[0][0] == "readonly")
+                        states.push(state);
+                    res = (modifier[0][1] == false) ? ['state', 'not in', states] : ['state', 'in', states];
+                });
+                this.field_modifiers.push(res);
+            }
 
             return (new instance.web.Model(this.dataset.model))
                 .call("check_access_rights", ["create", false])
@@ -246,10 +272,12 @@
 
                 eventDrop: function (event, _day_delta, _minute_delta, _all_day, _revertFunc) {
                     var data = self.get_event_data(event);
+                    if (event.readonly == true) return _revertFunc();
                     self.proxy('update_record')(event._id, data); // we don't revert the event, but update it.
                 },
                 eventResize: function (event, _day_delta, _minute_delta, _revertFunc) {
                     var data = self.get_event_data(event);
+                    if (event.readonly == true) return _revertFunc();
                     self.proxy('update_record')(event._id, data);
                 },
                 eventRender: function (event, element, view) {
@@ -490,18 +518,50 @@
             });
             return def;
         },
-        
+
+        process_modifiers: function(evt, modifier){
+            var compute_domain = instance.web.form.compute_domain;
+            var result = {
+                'readonly':false, 
+                'invisible': false,
+            }
+            var fields = [];
+            _.each(evt, function(d, k){
+                fields[k] = {'value': d};
+            });
+            if (this.field_attrs_modifiers.length) result['readonly'] = compute_domain(this.field_attrs_modifiers, fields);
+            else if (this.field_modifiers.length) result['readonly'] = compute_domain(this.field_modifiers, fields);
+            if (modifier) result['invisible'] = compute_domain(modifier, fields);
+            return result;
+         },
+
         /**
          * Transform OpenERP event object to fullcalendar event object
          */
         event_data_transform: function(evt) {
             var self = this;
+            _.each(this.fields_view.arch.children, function(node) {
+                if (node.attrs) {
+                    modifier = JSON.parse(node.attrs.modifiers || '{}')
+                    if (modifier.invisible instanceof Array){
+                        _.each(self.info_fields, function (fieldname) {
+                             if(fieldname == node.attrs.name){
+                                var result = self.process_modifiers(evt, modifier.invisible);
+                                if (result.invisible)
+                                    evt[fieldname] = null;
+                              }
+                         });
+                    }
+               }
+            });
+
 
             var date_delay = evt[this.date_delay] || 1.0,
                 all_day = this.all_day ? evt[this.all_day] : false,
                 res_computed_text = '',
                 the_title = '',
                 attendees = [];
+                readonly = self.process_modifiers(evt, false)['readonly'];
 
             if (!all_day) {
                 date_start = instance.web.auto_str_to_date(evt[this.date_start]);
@@ -518,7 +578,8 @@
                 
                 _.each(this.info_fields, function (fieldname) {
                     var value = evt[fieldname];
-                    if (_.contains(["many2one", "one2one"], self.fields[fieldname].type)) {
+                    if (value == null) return
+                    else if (_.contains(["many2one", "one2one"], self.fields[fieldname].type)) {
                         if (value === false) {
                             temp_ret[fieldname] = null;
                         }
@@ -546,7 +607,7 @@
                     res_computed_text = res_computed_text.replace("["+fieldname+"]",temp_ret[fieldname]);
                 });
 
-                
+
                 if (res_computed_text.length) {
                     the_title = res_computed_text;
                 }
@@ -594,7 +655,7 @@
                     the_title = the_title_avatar + the_title;
                 }
             }
-            
+
             if (!date_stop && date_delay) {
                 date_stop = date_start.clone().addHours(date_delay);
             }
@@ -604,7 +665,8 @@
                 'title': the_title,
                 'allDay': (this.fields[this.date_start].type == 'date' || (this.all_day && evt[this.all_day]) || false),
                 'id': evt.id,
-                'attendees':attendees
+                'attendees':attendees,
+                'readonly': readonly,
             };
             if (!self.useContacts || self.all_filters[evt[this.color_field]] !== undefined) {
                 if (this.color_field && evt[this.color_field]) {