summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorAkash Bhavsar <abh@odoo.com>2017-09-04 11:47:15 +0530
committerThibault Delavallée <tde@odoo.com>2017-09-07 17:53:50 +0200
commit0ff5acee9665b398d7d1c1bcdd7b47238e41f2b9 (patch)
treeed67909eed6d5da6c2e94723f6e833ab415fdb26 /addons
parentaf130256e3e1b1491bd33b276fe1b40f7b74e6fa (diff)
[FIX] web: allow default value for calendar quick create
* fix typo, widged is actually widget; * support name coming from context for calendar event quick create; Support of context could be made generic in quick create mechanism but in the meantime this fix is considered as sufficient for the use case we have.
Diffstat (limited to 'addons')
-rw-r--r--addons/web/static/src/js/views/calendar/calendar_quick_create.js2
-rw-r--r--addons/web/static/src/js/views/calendar/calendar_renderer.js6
-rw-r--r--addons/web/static/src/xml/web_calendar.xml2
3 files changed, 7 insertions, 3 deletions
diff --git a/addons/web/static/src/js/views/calendar/calendar_quick_create.js b/addons/web/static/src/js/views/calendar/calendar_quick_create.js
index c63ad5a47f2..698c5d8895a 100644
--- a/addons/web/static/src/js/views/calendar/calendar_quick_create.js
+++ b/addons/web/static/src/js/views/calendar/calendar_quick_create.js
@@ -55,7 +55,7 @@ var QuickCreate = Dialog.extend({
}},
{text: _t("Cancel"), close: true},
] : [],
- $content: QWeb.render('CalendarView.quick_create', {widged: this})
+ $content: QWeb.render('CalendarView.quick_create', {widget: this})
});
},
diff --git a/addons/web/static/src/js/views/calendar/calendar_renderer.js b/addons/web/static/src/js/views/calendar/calendar_renderer.js
index 9ec70551413..584813cba5a 100644
--- a/addons/web/static/src/js/views/calendar/calendar_renderer.js
+++ b/addons/web/static/src/js/views/calendar/calendar_renderer.js
@@ -330,7 +330,11 @@ return AbstractRenderer.extend({
self.$calendar.fullCalendar('unselect');
},
select: function (target_date, end_date, event, _js_event, _view) {
- self.trigger_up('openCreate', {'start': target_date, 'end': end_date});
+ var data = {'start': target_date, 'end': end_date};
+ if (self.state.context.default_name) {
+ data.title = self.state.context.default_name;
+ }
+ self.trigger_up('openCreate', data);
self.$calendar.fullCalendar('unselect');
},
eventRender: function (event, element) {
diff --git a/addons/web/static/src/xml/web_calendar.xml b/addons/web/static/src/xml/web_calendar.xml
index 430c2d3772c..6573a51ca4e 100644
--- a/addons/web/static/src/xml/web_calendar.xml
+++ b/addons/web/static/src/xml/web_calendar.xml
@@ -78,7 +78,7 @@
<div t-name="CalendarView.quick_create" class="o_calendar_quick_create">
<div class="form-group">
<label for='name' class='control-label'>Summary:</label>
- <input type='text' name='name' class="o_input"/>
+ <input type='text' name='name' class="o_input" t-att-value="widget.dataTemplate.name or None"/>
</div>
</div>
</template>