Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
pdvyas committed Feb 18, 2014
2 parents dd52519 + b344277 commit f079faa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"base_template": "lib/website/templates/base.html",
"framework_version": "3.9.5",
"framework_version": "3.9.6",
"modules": {
"Calendar": {
"color": "#2980b9",
Expand Down
2 changes: 1 addition & 1 deletion public/js/wn/views/query_report.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ wn.views.QueryReport = Class.extend({
var route = wn.get_route();
var me = this;
if(route[1]) {
if(me.report_name!=route[1]) {
if((me.report_name!=route[1]) || wn.route_options) {
me.report_name = route[1];
this.wrapper.find(".no-report-area").toggle(false);
me.appframe.set_title(wn._("Query Report")+": " + wn._(me.report_name));
Expand Down

0 comments on commit f079faa

Please sign in to comment.