').html(this.options.action.help)
);
+ var create_nocontent = this.$buttons;
+ this.$el.find('.oe_view_nocontent').click(function() {
+ create_nocontent.effect('bounce', {distance: 18, times: 5}, 150);
+ });
}
});
instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.ListView.List# */{
@@ -1045,7 +1052,11 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
var row = cells.join('');
this.$current
.children('tr:not([data-id])').remove().end()
- .append(new Array(count - this.records.length + 1).join(row));
+ .append(new Array(count - this.records.length + 1).join(row)).click(
+ function() {
+ $('button.oe_list_add').effect('bounce', {distance: 18, times: 5}, 150);
+ }
+ );
},
/**
* Gets the ids of all currently selected records, if any
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 02297e9db01..d170aacc89d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -318,8 +318,8 @@ instance.web.ActionManager = instance.web.Widget.extend({
}
return this.ir_actions_common(action, on_close, clear_breadcrumbs);
},
- ir_actions_client: function (action, on_close) {
- return this.ir_actions_common(action, on_close);
+ ir_actions_client: function (action, on_close, clear_breadcrumbs) {
+ return this.ir_actions_common(action, on_close, clear_breadcrumbs);
},
ir_actions_act_window_close: function (action, on_closed) {
if (!this.dialog && on_closed) {
@@ -327,7 +327,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
}
this.dialog_stop();
},
- ir_actions_server: function (action, on_closed) {
+ ir_actions_server: function (action, on_closed, clear_breadcrumbs) {
var self = this;
this.rpc('/web/action/run', {
action_id: action.id,
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index d1d028aa3f5..58bc224918c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -61,7 +61,7 @@
-
+
@@ -949,6 +953,7 @@
t-att-tabindex="widget.node.attrs.tabindex"
t-att-autofocus="widget.node.attrs.autofocus"
t-att-placeholder="! widget.get('effective_readonly') ? widget.node.attrs.placeholder : ''"
+ t-att-maxlength="widget.field.size"
>![]()
width: 83px;
-
+
+
+
+
+
+
+
diff --git a/addons/web_graph/controllers/graph.py b/addons/web_graph/controllers/graph.py
index f6c1343c042..e5c15898155 100644
--- a/addons/web_graph/controllers/graph.py
+++ b/addons/web_graph/controllers/graph.py
@@ -52,6 +52,9 @@ class GraphView(View):
def _convert(field, data, tick=True):
if fields[field]['type']=='many2one':
data = data and data[1]
+ elif (fields[field]['type']=='selection') and (type(fields[field]['selection']) in (list, tuple)):
+ d = dict(fields[field]['selection'])
+ data = d[data]
if tick:
return ticks.setdefault(data, len(ticks))
return data or 0
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index b3fef54d094..b82b1521e87 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -142,9 +142,11 @@ instance.web_graph.GraphView = instance.web.View.extend({
options_bar: function (data) {
var min = _(data.data).chain()
.map(function (record) {
- return _.min(record.data, function (item) {
- return item[1];
- })[1];
+ if (record.data.length > 0){
+ return _.min(record.data, function (item) {
+ return item[1];
+ })[1];
+ }
}).min().value();
return {
bars : {
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 48cf725ead3..cac006c2a70 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -7,14 +7,14 @@
background: url(/web/static/src/img/form_sheetbg.png);
}
.openerp .oe_kanban_view .ui-sortable-placeholder {
- border: 1px dotted black;
+ border: 1px solid rgba(0, 0, 0, 0.1);
visibility: visible !important;
height: 60px !important;
}
.openerp .oe_kanban_view .ui-sortable-helper {
- -moz-box-shadow: 0 1px 20px rgba(0, 0, 0, 0.9);
- -webkit-box-shadow: 0 1px 20px rgba(0, 0, 0, 0.9);
- -box-shadow: 0 1px 20px rgba(0, 0, 0, 0.9);
+ -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3);
+ -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3);
+ -box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3);
-moz-transform: rotate(3deg);
-webkit-transform: rotate(3deg);
-o-transform: rotate(3deg);
@@ -135,7 +135,8 @@
white-space: nowrap;
display: none;
position: relative;
- top: 5px;
+ opacity: 0.75;
+ top: 20px;
}
.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
margin-left: 4px;
@@ -143,6 +144,10 @@
position: relative;
top: -8px;
}
+.openerp .oe_kanban_view .oe_kanban_card, .openerp .oe_kanban_view .oe_dropdown_toggle {
+ cursor: pointer;
+ display: inline-block;
+}
.openerp .oe_kanban_view .oe_kanban_add {
float: right;
}
@@ -200,7 +205,7 @@
.openerp .oe_kanban_view .oe_kanban_record {
position: relative;
display: block;
- min-height: 50px;
+ min-height: 20px;
margin: 0;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
@@ -346,8 +351,8 @@
position: relative;
display: block;
background: white;
- border: 1px solid #d8d8d8;
- border-bottom-color: #b9b9b9;
+ border: 1px solid rgba(0, 0, 0, 0.16);
+ border-bottom-color: rgba(0, 0, 0, 0.3);
padding: 8px;
display: block;
-moz-border-radius: 4px;
@@ -511,33 +516,43 @@
}
.openerp .oe_kanban_view .oe_kanban_color_0 {
background-color: white;
+ color: #5a5a5a;
}
.openerp .oe_kanban_view .oe_kanban_color_1 {
background-color: #cccccc;
+ color: #424242;
}
.openerp .oe_kanban_view .oe_kanban_color_2 {
background-color: #ffc7c7;
+ color: #7a3737;
}
.openerp .oe_kanban_view .oe_kanban_color_3 {
background-color: #fff1c7;
+ color: #756832;
}
.openerp .oe_kanban_view .oe_kanban_color_4 {
background-color: #e3ffc7;
+ color: #5d6937;
}
.openerp .oe_kanban_view .oe_kanban_color_5 {
background-color: #c7ffd5;
+ color: #1a7759;
}
.openerp .oe_kanban_view .oe_kanban_color_6 {
background-color: #c7ffff;
+ color: #1a5d83;
}
.openerp .oe_kanban_view .oe_kanban_color_7 {
background-color: #c7d5ff;
+ color: #3b3e75;
}
.openerp .oe_kanban_view .oe_kanban_color_8 {
background-color: #e3c7ff;
+ color: #4c3668;
}
.openerp .oe_kanban_view .oe_kanban_color_9 {
background-color: #ffc7f1;
+ color: #6d2c70;
}
.openerp .oe_form .oe_kanban_view .oe_kanban_column, .openerp .oe_form .oe_kanban_view .oe_kanban_group_header {
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 95a63dbd1a2..7b10be6c249 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -42,11 +42,11 @@
&.oe_kanban_grouped .oe_kanban_dummy_cell
background: url(/web/static/src/img/form_sheetbg.png)
.ui-sortable-placeholder
- border: 1px dotted black
+ border: 1px solid rgba(0,0,0,0.1)
visibility: visible !important
height: 60px !important
.ui-sortable-helper
- @include box-shadow(0 1px 20px rgba(0, 0, 0, 0.9))
+ @include box-shadow(0 1px 10px rgba(0, 0, 0, 0.3))
@include transform(rotate(3deg))
.oe_kanban_left
float: left
@@ -146,7 +146,8 @@
white-space: nowrap
display: none
position: relative
- top: 5px
+ opacity: 0.75
+ top: 20px
// }}}
// KanbanQuickCreate {{{
.oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle
@@ -154,6 +155,9 @@
cursor: pointer
position: relative
top: -8px
+ .oe_kanban_card, .oe_dropdown_toggle
+ cursor: pointer
+ display: inline-block
.oe_kanban_add
float: right
@@ -199,7 +203,7 @@
.oe_kanban_record
position: relative
display: block
- min-height: 50px
+ min-height: 20px
margin: 0
@include radius(4px)
&:last-child
@@ -311,8 +315,8 @@
position: relative
display: block
background: white
- border: 1px solid #d8d8d8
- border-bottom-color: #b9b9b9
+ border: 1px solid rgba(0,0,0,0.16)
+ border-bottom-color: rgba(0,0,0,0.3)
padding: 8px
display: block
@include radius(4px)
@@ -430,33 +434,34 @@
// KanbanColors {{{
.oe_kanban_color_0
background-color: #FFFFFF
-
+ color: #5a5a5a
.oe_kanban_color_1
background-color: #CCCCCC
-
+ color: #424242
.oe_kanban_color_2
background-color: #FFC7C7
-
+ color: #7a3737
.oe_kanban_color_3
background-color: #FFF1C7
-
+ color: #756832
.oe_kanban_color_4
background-color: #E3FFC7
-
+ color: #5d6937
.oe_kanban_color_5
background-color: #C7FFD5
-
+ color: #1a7759
.oe_kanban_color_6
background-color: #C7FFFF
-
+ color: #1a5d83
.oe_kanban_color_7
background-color: #C7D5FF
-
+ color: #3b3e75
.oe_kanban_color_8
background-color: #E3C7FF
-
+ color: #4c3668
.oe_kanban_color_9
background-color: #FFC7F1
+ color: #6d2c70
.openerp .oe_form .oe_kanban_view
.oe_kanban_column, .oe_kanban_group_header
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 5f9f3027b65..bd36dcbf4ba 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -71,6 +71,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
this.fields_keys = _.keys(this.fields_view.fields);
this.add_qweb_template();
this.has_been_loaded.resolve();
+ this._super.apply(this, arguments);
return $.when();
},
_is_quick_create_enabled: function() {
@@ -85,6 +86,9 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
return false;
return this._super(action);
},
+ /* add_qweb_template
+ * select the nodes into the xml and send to extract_aggregates the nodes with TagName="field"
+ */
add_qweb_template: function() {
for (var i=0, ii=this.fields_view.arch.children.length; i < ii; i++) {
var child = this.fields_view.arch.children[i];
@@ -97,6 +101,9 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
}
}
},
+ /* extract_aggregates
+ * extract the agggregates from the nodes (TagName="field")
+ */
extract_aggregates: function(node) {
for (var j = 0, jj = this.group_operators.length; j < jj; j++) {
if (node.attrs[this.group_operators[j]]) {
@@ -121,9 +128,15 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
}
switch (node.tag) {
case 'field':
- node.tag = QWeb.prefix;
- node.attrs[QWeb.prefix + '-esc'] = 'record.' + node.attrs['name'] + '.value';
- this.extract_aggregates(node);
+ if(this.fields_view.fields[ node.attrs['name'] ].type == 'many2many'){
+ node.tag = 'div';
+ node.attrs['class'] = 'oe_form_field oe_tags';
+ node.attrs['model'] = this.fields_view.fields[node.attrs['name']].relation;
+ node.attrs['t-att-data'] = 'record.' + node.attrs['name'] + '.raw_value';
+ }else {
+ node.tag = QWeb.prefix;
+ node.attrs[QWeb.prefix + '-esc'] = 'record.' + node.attrs['name'] + '.value';
+ }
break;
case 'button':
case 'a':
@@ -350,6 +363,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
} else {
this.$el.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle');
}
+ instance.web_kanban.KanbanView.postprocessing_widget_many2many_tags(self);
},
on_record_moved : function(record, old_group, old_index, new_group, new_index) {
var self = this;
@@ -427,9 +441,49 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
this.$el.prepend(
$(', 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-09-19 12:09+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: French (Canada) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-20 04:49+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
+
+
+ Name:
+
+').html(this.options.action.help)
);
+ var create_nocontent = this.$buttons;
+ this.$el.find('.oe_view_nocontent').click(function() {
+ create_nocontent.effect('bounce', {distance: 18, times: 5}, 150);
+ });
}
});
+/*
+* widget for list of tags/categories
+* make the rpc request for all ids/model and insert value inside .oe_tags fields
+*/
+instance.web_kanban.KanbanView.postprocessing_widget_many2many_tags = function(self){
+ var model_list_id={};
+
+ // select all widget for the kanban view or the widget inside the record
+ self.$el.find(".oe_form_field.oe_tags").each(function(){
+ var model = $(this).attr("model");
+ if(model.length){
+ var data = $(this).attr("data");
+ var list = data.split(",");
+
+ //select all id (per model)
+ if(!model_list_id[model]) model_list_id[model]=[];
+ for(var t=0;t0){
+ var block = self.$el.find(".oe_form_field.oe_tags[model='" + model + "']");
+ var dataset = new instance.web.DataSetSearch(self, model, self.session.context);
+ dataset.name_get(_.uniq( model_list_id[model] )).then(
+ function(result) {
+ for(var t=0;t'+result[t][1]+'');
+ }
+ }
+ );
+ }
+ }
+}
+
function get_class(name) {
return new instance.web.Registry({'tmp' : name}).get_object("tmp");
}
@@ -502,7 +556,9 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
});
this.$el.find('.oe_kanban_add').click(function () {
- if (self.quick) { return; }
+ if (self.quick) {
+ return self.quick.trigger('close');
+ }
var ctx = {};
ctx['default_' + self.view.group_by] = self.value;
self.quick = new (get_class(self.view.quick_create_class))(this, self.dataset, ctx, true)
@@ -758,7 +814,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
}
});
- if (this.$el.find('.oe_kanban_global_click').length) {
+ if (this.$el.find('.oe_kanban_global_click,.oe_kanban_global_click_edit').length) {
this.$el.on('click', function(ev) {
if (!ev.isTrigger && !$(ev.target).data('events')) {
var trigger = true;
@@ -799,8 +855,15 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
});
}
},
+ /* actions when user click on the block with a specific class
+ * open on normal view : oe_kanban_global_click
+ * open on form/edit view : oe_kanban_global_click_edit
+ */
on_card_clicked: function(ev) {
- this.view.open_record(this.id);
+ if(this.$el.find('.oe_kanban_global_click_edit').size()>0)
+ this.do_action_edit();
+ else
+ this.do_action_open();
},
setup_color_picker: function() {
var self = this;
@@ -855,6 +918,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
self.$el.data('widget', self);
self.bind_events();
self.group.compute_cards_auto_height();
+ instance.web_kanban.KanbanView.postprocessing_widget_many2many_tags(self);
} else {
self.destroy();
}
@@ -955,7 +1019,8 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({
$(".oe_kanban_quick_create_add", this.$el).click(function () {
self.quick_add();
});
- $(".oe_kanban_quick_create_close", this.$el).click(function () {
+ $(".oe_kanban_quick_create_close", this.$el).click(function (ev) {
+ ev.preventDefault();
self.trigger('close');
});
self.$input.keyup(function(e) {
@@ -973,7 +1038,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({
quick_add: function () {
var self = this;
this._dataset.call(
- 'name_create', [self.$input.val(), new instance.web.CompoundContext(
+ 'name_create', [self.$input.val() || false, new instance.web.CompoundContext(
this._dataset.get_context(), this._context)])
.pipe(function(record) {
self.$input.val("");
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 3537e96b4c8..817fcd919b1 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -86,7 +86,7 @@
diff --git a/addons/web_tests/i18n/fr_CA.po b/addons/web_tests/i18n/fr_CA.po
new file mode 100644
index 00000000000..1247eb6c025
--- /dev/null
+++ b/addons/web_tests/i18n/fr_CA.po
@@ -0,0 +1,20 @@
+# French (Canada) translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR