[REV]revert last commit.

bzr revid: vme@tinyerp.com-20120522122001-01297nqy4uq3xe7b
This commit is contained in:
Vidhin Mehta (OpenERP)
2012-05-22 17:50:01 +05:30
parent 598d9b30cb
commit d89a2335e8
4 changed files with 2065 additions and 1759 deletions
File diff suppressed because it is too large Load Diff
-20
View File
@@ -1737,25 +1737,5 @@ $colour4: #8a89ba
right: 2px
// }}}
// view editor
.openerp
.oe_view_editor
width: 100%
border-collapse: collapse
margin-left: -12px
width: 100%
background-color: white
border-spacing: 0
td
text-align: center
white-space: nowrap
border: 1px solid #D8D8D8
cursor: pointer
font-size: 90%
.oe_view_editor_field td
border: 0px !important
.oe_view_editor tr:hover
background-color: #ecebf2
// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
+2 -2
View File
@@ -27,7 +27,7 @@ var SearchBox_renderFacet = function (facet, position) {
return view;
}; // warning: will not match
// Ensure we're replacing the function we think
if (SearchBox_renderFacet.toString() == VS.ui.SearchBox.prototype.renderFacet.toString().replace(/(VS\.ui\.SearchFacet)/, "(this.app.options.callbacks['make_facet'] || $1)")) {
if (SearchBox_renderFacet.toString() !== VS.ui.SearchBox.prototype.renderFacet.toString().replace(/(VS\.ui\.SearchFacet)/, "(this.app.options.callbacks['make_facet'] || $1)")) {
throw new Error(
"Trying to replace wrong version of VS.ui.SearchBox#renderFacet. "
+ "Please fix replacement.");
@@ -38,7 +38,7 @@ var SearchBox_renderSearchInput = function () {
this.inputViews.push(input);
};
// Ensure we're replacing the function we think
if (SearchBox_renderSearchInput.toString() == VS.ui.SearchBox.prototype.renderSearchInput.toString().replace(/(VS\.ui\.SearchInput)/, "(this.app.options.callbacks['make_input'] || $1)")) {
if (SearchBox_renderSearchInput.toString() !== VS.ui.SearchBox.prototype.renderSearchInput.toString().replace(/(VS\.ui\.SearchInput)/, "(this.app.options.callbacks['make_input'] || $1)")) {
throw new Error(
"Trying to replace wrong version of VS.ui.SearchBox#renderSearchInput. "
+ "Please fix replacement.");
+1 -2
View File
@@ -52,11 +52,10 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({
this.view_edit_dialog.on_close.add_last(function(){window.location.reload();});
this.main_view_id = this.parent.fields_view.view_id;
this.action_manager = new instance.web.ActionManager(this);
this.action_manager.appendTo(this.view_edit_dialog);
$.when(this.action_manager.do_action(action)).then(function() {
var viewmanager = self.action_manager.inner_viewmanager,
controller = viewmanager.views[viewmanager.active_view].controller;
self.action_manager.appendTo(self.view_edit_dialog.$element);
self.action_manager.renderElement(self.view_edit_dialog);
controller.on_loaded.add_last(function(){
$(controller.groups).bind({
'selected': function(e, ids, records) {