-
Match the records with the following rule:
+
Match records with the following rule:
- Match the records with
+ Match records with
of the following rules:
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 533e8e8b23a..c0a9b2c372f 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -134,6 +134,7 @@
+
@@ -155,6 +156,7 @@
+
diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index 9c6f1df5e8c..ce8643f04de 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -161,6 +161,11 @@ var FieldTextHtmlSimple = widget.extend({
return !this.get('value') || this.get('value') === "
" || !this.get('value').match(/\S/);
},
commit_value: function () {
+ /* Switch to WYSIWYG mode if currently in code view */
+ if (session.debug) {
+ var layoutInfo = this.$textarea.data('layoutInfo');
+ $.summernote.pluginEvents.codeview(undefined, undefined, layoutInfo, false);
+ }
if (this.options['style-inline']) {
transcoder.class_to_style(this.$content);
transcoder.font_to_img(this.$content);
@@ -377,6 +382,11 @@ var FieldTextHtml = widget.extend({
this._dirty_flag = false;
return this.editor.save();
} else if (this._dirty_flag && this.editor && this.editor.buildingBlock) {
+ /* Switch to WYSIWYG mode if currently in code view */
+ if (session.debug) {
+ var layoutInfo = this.editor.rte.editable().data('layoutInfo');
+ $.summernote.pluginEvents.codeview(undefined, undefined, layoutInfo, false);
+ }
this.editor.buildingBlock.clean_for_save();
this.internal_set_value( this.$content.html() );
}
diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/rte.summernote.js
index 1789ed69e7e..9f908a245bc 100644
--- a/addons/web_editor/static/src/js/rte.summernote.js
+++ b/addons/web_editor/static/src/js/rte.summernote.js
@@ -511,12 +511,32 @@ function prettify_html(html) {
}
return result;
}
-$.summernote.pluginEvents.codeview = function (event, editor, layoutInfo) {
+
+/*
+ * This override when clicking on the 'Code View' button has two aims:
+ *
+ * - have our own code view implementation for FieldTextHtml
+ * - add an 'enable' paramater to call the function directly and allow us to
+ * disable (false) or enable (true) the code view mode.
+ */
+$.summernote.pluginEvents.codeview = function (event, editor, layoutInfo, enable) {
+ if (layoutInfo === undefined) {
+ return;
+ }
if (layoutInfo.toolbar) {
+ // if editor inline (FieldTextHtmlSimple)
+ var is_activated = $.summernote.eventHandler.modules.codeview.isActivated(layoutInfo);
+ if (is_activated === enable) {
+ return;
+ }
return eventHandler.modules.codeview.toggle(layoutInfo);
} else {
+ // if editor iframe (FieldTextHtml)
var $editor = layoutInfo.editor();
var $textarea = $editor.prev('textarea');
+ if ($textarea.is('textarea') === enable) {
+ return;
+ }
if (!$textarea.length) {
// init and create texarea
diff --git a/addons/web_kanban/static/src/js/kanban_view.js b/addons/web_kanban/static/src/js/kanban_view.js
index 4917c24b241..7cce7617da9 100644
--- a/addons/web_kanban/static/src/js/kanban_view.js
+++ b/addons/web_kanban/static/src/js/kanban_view.js
@@ -710,24 +710,19 @@ var KanbanView = View.extend({
var context = {};
context['default_' + this.group_by_field] = column.id;
var name = event.data.value;
- this.dataset.name_create(name, context).then(function on_success (data) {
+ this.dataset.name_create(name).done(function(data) {
add_record(data[0]);
- }, function on_fail (event) {
+ }).fail(function(error, event) {
event.preventDefault();
- var popup = new form_common.SelectCreatePopup(this);
- popup.select_element(
- self.model,
- {
- title: _t("Create: "),
- initial_view: "form",
- disable_multiple_selection: true
- },
- [],
- {"default_name": name}
- );
- popup.on("elements_selected", self, function(element_ids) {
- add_record(element_ids[0]);
- });
+ var dialog = new form_common.FormViewDialog(self, {
+ res_model: self.model,
+ context: _.extend({"default_name": name}, context),
+ title: _t("Create"),
+ disable_multiple_selection: true,
+ on_selected: function(element_ids) {
+ add_record(element_ids[0]);
+ }
+ }).open();
});
function add_record(id) {
@@ -817,8 +812,20 @@ function transform_qweb_template (node, fvg, many2manys) {
} else if (fields_registry.contains(ftype)) {
// do nothing, the kanban record will handle it
} else {
- node.tag = qweb.prefix;
- node.attrs[qweb.prefix + '-esc'] = 'record.' + node.attrs.name + '.value';
+ if (node.attrs.bold) {
+ node.tag = 'strong';
+ var children_node = {
+ attrs: {},
+ children: [],
+ tag: qweb.prefix,
+ };
+ children_node.attrs[qweb.prefix + '-esc'] = 'record.' + node.attrs.name + '.value';
+ node.children.push(children_node);
+ } else {
+ node.tag = qweb.prefix;
+ node.attrs[qweb.prefix + '-esc'] = 'record.' + node.attrs.name + '.value';
+ }
+
}
break;
case 'button':
diff --git a/addons/web_kanban/static/src/less/kanban_view.less b/addons/web_kanban/static/src/less/kanban_view.less
index 877559ddf1f..0640fe9f3e3 100644
--- a/addons/web_kanban/static/src/less/kanban_view.less
+++ b/addons/web_kanban/static/src/less/kanban_view.less
@@ -65,7 +65,9 @@
}
.o_dropdown_kanban {
- float: right;
+ position: absolute;
+ top: 5px;
+ right: 10px;
@media (max-width: @screen-xs-max) {
visibility: visible;
}
diff --git a/addons/website_crm/views/website_crm_config_settings_views.xml b/addons/website_crm/views/website_crm_config_settings_views.xml
index 8f8c4e9dbe6..a141b4e4509 100644
--- a/addons/website_crm/views/website_crm_config_settings_views.xml
+++ b/addons/website_crm/views/website_crm_config_settings_views.xml
@@ -6,7 +6,7 @@