Merge branch 'develop'

config.json

@@ -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", 

public/js/wn/app.js

@@ -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();
 		}
 	},
 	

public/js/wn/assets.js

@@ -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

public/js/wn/views/query_report.js

@@ -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 = {};