pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]Dashboard items added.

Browse Source 
bzr revid: vme@tinyerp.com-20120607103029-0iumqrzigswzpny8
This commit is contained in:
Vidhin Mehta (OpenERP)
2012-06-07 16:00:29 +05:30
parent a91e66b76b
commit ff00c0f635
3 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/controllers/main.py
+19 -4
View File
@@ -1286,14 +1286,29 @@ class SearchView(View):
del filter['context']
del filter['domain']
return filters
@openerpweb.jsonrequest
def get_all_dashboard(self, req):
all_dashboard = []
Model = req.session.model('ir.actions.act_window')
Dashboard_Menus = req.session.model('ir.values')
Dashboard_act_window = Model.search_read([('res_model','=',"board.board"), ('view_id','!=', False) ],['name','id'])
for i in Dashboard_act_window:
tuple_of_dashboard = "ir.actions.act_window," + str(i["id"])
menu_id = Dashboard_Menus.search_read([('value','=',tuple_of_dashboard)],['res_id'])
if menu_id:
all_dashboard.append({"res_id":menu_id[0]["res_id"],"name":i["name"]})
return all_dashboard
@openerpweb.jsonrequest
def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''):
ctx = common.nonliterals.CompoundContext(context_to_save)
ctx.session = req.session
ctx = ctx.evaluate()
to_eval = common.nonliterals.CompoundContext(context_to_save)
to_eval.session = req.session
ctx = dict((k, v) for k, v in to_eval.evaluate().iteritems()
if not k.startswith('search_default_'))
ctx['dashboard_merge_domains_contexts'] = False # TODO: replace this 6.1 workaround by attribute on <action/>
domain = common.nonliterals.CompoundDomain(domain)
print "domainnnnn",domain
domain.session = req.session
domain = domain.evaluate()
addons/web/static/src/js/search.js
+17 -25
View File
@@ -1628,42 +1628,36 @@ instance.web.search.Filters = instance.web.search.Input.extend({
instance.web.search.AddToDashboard = instance.web.search.Input.extend({
template: 'SearchView.addtodashboard',
_in_drawer: true,
init: function(){
var menu = instance.webclient.menu;
console.log("menu",menu);
this.menu_data = _.map(menu.data.data.children,
function(menu){
console.log(menu);
var obj = {}; obj["id"] = menu.id; obj["name"] = menu.name; return obj;
//support after update of _.underscore.js lib 1.3.3
//return _.pick(menu, 'id', 'name');
});
this.selected_menu_id = menu.$element.find('a.oe_active').data('menu');
this._super.apply(this, arguments);
},
start: function () {
var self = this;
this.$element
.on('click', 'h4', this.proxy('show_option'))
.on('submit', 'form', function (e) {e.preventDefault(); self.add_dashboard();});
this.$element.find('.searchview_extended_delete_prop').click(function () {self.$element.toggleClass('oe_opened');});
return this.rpc('/web/searchview/get_all_dashboard', {}, function(r) {self.menu_data = r;}).pipe(this.proxy("render_data"))
},
render_data: function(){
var self = this;
var selection = instance.web.qweb.render("SearchView.addtodashboard.selection",{selections:this.menu_data});
this.$element.find("input").before(selection)
},
add_dashboard:function(){
var self = this,getParent = this.getParent(),view_parent = this.view.getParent();
if(!view_parent.action || !this.$element.find("select").val())
return this.do_warn("Can't add dashboard item");
data = getParent.build_search_data(),
context = new instance.web.CompoundContext(getParent.dataset.get_context() || []),
domain = new instance.web.CompoundDomain(getParent.dataset.get_domain() || []);
this.$element.toggleClass('oe_opened');
var menu_id = this.$element.find("select").val();
var ds_name = this.$element.find("input").val();
data = this.getParent().build_search_data();
context = new instance.web.CompoundContext(),
domain = new instance.web.CompoundDomain();
_.each(data.contexts, function(x) {context.add(x);});
_.each(data.domains, function(x) {domain.add(x);});
this.rpc('/web/searchview/add_to_dashboard', {
menu_id: menu_id,
action_id: this.view.getParent().action.id,
menu_id: this.$element.find("select").val(),
action_id: view_parent.action.id,
context_to_save: context,
domain: domain,
view_mode: this.view.getParent().active_view,
name: ds_name
view_mode: view_parent.active_view,
name: this.$element.find("input").val()
}, function(r) {
if (r === false) {
self.do_warn("Could not add filter to dashboard");
@@ -1676,10 +1670,8 @@ instance.web.search.AddToDashboard = instance.web.search.Input.extend({
this.$element.toggleClass('oe_opened');
if (! this.$element.hasClass('oe_opened'))
return;
var action_id = this.view.getParent().action.id;
this.$element.find("input").val(this.getParent().fields_view.name );
this.$element.find("input").val(this.getParent().fields_view.name || "" );
}
})
instance.web.search.Advanced = instance.web.search.Input.extend({
template: 'SearchView.advanced',
addons/web/static/src/xml/base.xml
+7 -5
View File
@@ -1417,11 +1417,6 @@
<form>
<ul>
<li>
<select title = "Select Dashboard to add this filter to" style="width: 30%; margin-right: 1em;">
<option t-foreach="widget.menu_data" t-as="menu" t-att-value="menu.id" t-att-selected="(menu.id == widget.selected_menu_id) || undefined"><t t-esc="menu.name"/>
</option>
</select>
<input placeholder ="Title of new Dashboard item" title = "Title of new Dashboard item" type="text" style="width: 30%; margin-right: 1em;"/>
<button class="oe_apply" type="submit">save</button>
<a style="width: 30%;" class="searchview_extended_delete_prop button">x</a>
@@ -1429,6 +1424,13 @@
</ul>
</form>
</div>
<t t-name="SearchView.addtodashboard.selection">
<select title = "Select Dashboard to add this filter to" style="width: 40%; margin-right: 1em;">
<t t-foreach="selections" t-as="element">
<option t-att-value="element.res_id"><t t-esc="element.name"/></option>
</t>
</select>
</t>
<div t-name="SearchView.advanced" class="oe_searchview_advanced">
<h4>Advanced Search</h4>
<form>