Browse Source

Merge branch 'develop'

version-14
Pratik Vyas 11 years ago
parent
commit
ac4d34d635
4 changed files with 19 additions and 2 deletions
  1. +1
    -1
      config.json
  2. +1
    -1
      public/js/wn/app.js
  3. +6
    -0
      public/js/wn/assets.js
  4. +11
    -0
      public/js/wn/views/query_report.js

+ 1
- 1
config.json View File

@@ -1,6 +1,6 @@
{
"base_template": "lib/website/templates/base.html",
"framework_version": "3.3.1",
"framework_version": "3.3.2",
"modules": {
"Calendar": {
"color": "#2980b9",


+ 1
- 1
public/js/wn/app.js View File

@@ -92,7 +92,7 @@ wn.Application = Class.extend({
if(wn.boot.metadata_version != localStorage.metadata_version) {
localStorage.clear();
console.log("Cleared Cache - New Metadata");
localStorage.metadata_version = wn.boot.metadata_version;
wn.assets.init_local_storage();
}
},


+ 6
- 0
public/js/wn/assets.js View File

@@ -41,8 +41,14 @@ wn.assets = {
localStorage.clear();
console.log("Cleared localstorage");
}
wn.assets.init_local_storage();
},
init_local_storage: function() {
localStorage._last_load = new Date();
localStorage._version_number = window._version_number;
if(wn.boot) localStorage.metadata_version = wn.boot.metadata_version;
},
// check if the asset exists in


+ 11
- 0
public/js/wn/views/query_report.js View File

@@ -124,12 +124,23 @@ wn.views.QueryReport = Class.extend({
if(df.get_query) f.get_query = df.get_query;
}
});
this.set_route_filters()
this.set_filters_by_name();
},
clear_filters: function() {
this.filters = [];
this.appframe.parent.find('.appframe-form .filters').remove();
},
set_route_filters: function() {
var me = this;
if(wn.route_options) {
$.each(this.filters || [], function(i, f) {
if(wn.route_options[f.df.fieldname]!=null)
f.set_input(wn.route_options[f.df.fieldname]);
});
}
wn.route_options = null;
},
set_filters_by_name: function() {
this.filters_by_name = {};


Loading…
Cancel
Save