openerp-dev-web team mailing list archive

["cpa\(OpenERP\)" <cpa@xxxxxxxxxxx>]

cpa(OpenERP) has proposed merging lp:~openerp-dev/openobject-client-web/calender_view into lp:openobject-client-web.

Requested reviews:
  OpenERP SA's Web Client R&D (openerp-dev-web)


Hello 
Please refer this bug:687706

Thanks.
-- 
https://code.launchpad.net/~openerp-dev/openobject-client-web/calender_view/+merge/43745
Your team OpenERP SA's Web Client R&D is requested to review the proposed merge of lp:~openerp-dev/openobject-client-web/calender_view into lp:openobject-client-web.

=== modified file 'addons/view_calendar/static/javascript/calendar_month.js'
--- addons/view_calendar/static/javascript/calendar_month.js	2010-12-14 07:23:09 +0000
+++ addons/view_calendar/static/javascript/calendar_month.js	2010-12-15 10:37:02 +0000
@@ -207,7 +207,7 @@
                 nCreationId: cuid,
                 nWriteDate: toISOTimestamp(wdate),
                 nWriteId: wuid
-            }, params.text);
+            }, PRE(null,params.text));
 
             div.className = params.className;
             div.title = params.title;

=== modified file 'addons/view_calendar/static/javascript/calendar_week.js'
--- addons/view_calendar/static/javascript/calendar_week.js	2010-12-14 07:23:09 +0000
+++ addons/view_calendar/static/javascript/calendar_week.js	2010-12-15 10:37:02 +0000
@@ -702,7 +702,7 @@
             t.shift();
             t = t.join(' - ');
 
-            title.innerHTML = s.strftime('%H:%M') + ' - ' + t;
+            title.innerHTML = '<pre>' + s.strftime('%H:%M') + ' - ' + t + '</pre>';
         });
 
         req.addBoth(function(obj) {

=== modified file 'addons/view_calendar/widgets/templates/day.mako'
--- addons/view_calendar/widgets/templates/day.mako	2010-12-02 17:08:21 +0000
+++ addons/view_calendar/widgets/templates/day.mako	2010-12-15 10:37:02 +0000
@@ -76,7 +76,7 @@
                             nWriteId="${evt.write_uid}" 
                             style="background-color: ${evt.color}" 
                             class="calEvent noAllDay ${evt.classes}">
-                           <div style="height: 10px;" class="calEventTitle">${evt.starts.strftime('%I:%M %P')} - ${evt.title}</div>
+                           <div style="height: 10px;" class="calEventTitle"><pre>${evt.starts.strftime('%I:%M %P')} - ${evt.title}</pre></div>
                            <div class="calEventDesc">${evt.description}</div>
                            <div class="calEventGrip"></div>
                         </div>

=== modified file 'addons/view_calendar/widgets/templates/week.mako'
--- addons/view_calendar/widgets/templates/week.mako	2010-12-02 17:08:21 +0000
+++ addons/view_calendar/widgets/templates/week.mako	2010-12-15 10:37:02 +0000
@@ -73,7 +73,7 @@
                             nWriteId="${evt.write_uid}"
                             style="background-color: ${evt.color};"
                             class="calEvent noAllDay ${evt.classes}">
-                           <div style="height: 10px;" class="calEventTitle">${evt.starts.strftime('%H:%M')} - ${evt.title}</div>
+                           <div style="height: 10px;" class="calEventTitle"><pre>${evt.starts.strftime('%H:%M')} - ${evt.title}</pre></div>
                            <div class="calEventDesc">${evt.description}</div>
                            <div class="calEventGrip"></div>
                         </div>