From bb8380314c8ce87707a900fa615915760f3e7f16 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 30 Apr 2012 02:01:58 +0200 Subject: [PATCH] Clark Gable is dead. Frankly, my dear, I don't give a damn. bzr revid: al@openerp.com-20120430000158-fp451ymdjxgzwi8v --- addons/web/static/src/js/view_form.js | 2 -- addons/web/static/src/js/view_list.js | 14 +------------- addons/web/static/src/js/view_list_editable.js | 2 -- addons/web/static/src/xml/base.xml | 7 +------ 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 5f24822c13b..b77bbd77e02 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2705,7 +2705,6 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ if (self.get("effective_readonly")) { view.options.addable = null; view.options.deletable = null; - view.options.isClarkGable = false; } } else if (view.view_type === "form") { if (self.get("effective_readonly")) { @@ -3081,7 +3080,6 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({ 'addable': self.get("effective_readonly") ? null : _t("Add"), 'deletable': self.get("effective_readonly") ? false : true, 'selectable': self.multi_selection, - 'isClarkGable': self.get("effective_readonly") ? false : true }); var embedded = (this.field.views || {}).tree; if (embedded) { diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index ced727987b4..b8ce905a528 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -20,8 +20,6 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi 'sortable': true, // whether the view rows can be reordered (via vertical drag & drop) 'reorderable': true, - // display an edit icon linking to form view - 'isClarkGable': true }, /** * Core class for list-type displays. @@ -932,11 +930,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web. if (!self.dataset.select_id(row_id)) { throw "Could not find id in dataset" } - var view; - if ($(e.target).is('.oe-record-edit-link-img')) { - view = 'form'; - } - self.row_clicked(e, view); + self.row_clicked(e); } }); }, @@ -1011,9 +1005,6 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web. if (this.options.selectable) { cells.push(''); } - if (this.options.isClarkGable) { - cells.push(''); - } _(this.columns).each(function(column) { if (column.invisible === '1') { return; @@ -1322,9 +1313,6 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we if (self.options.selectable) { $row.append(''); } - if (self.options.isClarkGable) { - $row.append(''); - } _(self.columns).chain() .filter(function (column) {return !column.invisible;}) .each(function (column) { diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index 816143afa5d..e539d17e63f 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -398,8 +398,6 @@ openerp.web.list_editable = function (instance) { if (this.view.editable_list.options.selectable) $("").appendTo($element); - if (this.view.editable_list.options.isClarkGable) - $("").appendTo($element); $xml.children().each(function(i, el) { var modifiers = JSON.parse($(el).attr("modifiers") || "{}"); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 7c99777ec1a..76d75d60a43 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -619,7 +619,7 @@ - + - @@ -695,9 +693,6 @@ -
@@ -637,7 +637,6 @@ @@ -650,7 +649,6 @@
- - -