ui bug fixes

frappe/boot.py

@@ -43,6 +43,7 @@ def get_bootinfo():
 		except ImportError, e:
 			pass
 
+	bootinfo.module_app = frappe.local.module_app
 	bootinfo.hidden_modules = frappe.db.get_global("hidden_modules")
 	bootinfo.doctype_icons = dict(frappe.db.sql("""select name, icon from 
 		tabDocType where ifnull(icon,'')!=''"""))

frappe/public/js/frappe/form/control.js

@@ -103,20 +103,22 @@ frappe.ui.form.ControlImage = frappe.ui.form.Control.extend({
 	make: function() {
 		this._super();
 		var me = this;
-		this.$wrapper
+		this.$wrapper = $("<div></div>").appendTo(this.parent);
+		this.$body = $("<div>").appendTo(this.$wrapper)
 			.css({"margin-bottom": "10px", "margin-right": "15px", "float": "right", 
 				"text-align": "right", "max-width": "100%"})
-			.on("refresh", function() {
-				me.$wrapper.empty();
+		this.$wrapper.on("refresh", function() {
+				me.$body.empty();
 				if(me.df.options && me.frm.doc[me.df.options]) {
-					$("<img src='"+me.frm.doc[me.df.options]+"' style='max-width: 70%;'>")
-						.appendTo(me.$wrapper);
+					me.$img = $("<img src='"+me.frm.doc[me.df.options]+"' style='max-width: 70%;'>")
+						.appendTo(me.$body);
 				} else {
-					$("<div class='missing-image'><i class='icon-camera'></i></div>")
-						.appendTo(me.$wrapper)
+					me.$buffer = $("<div class='missing-image'><i class='icon-camera'></i></div>")
+						.appendTo(me.$body)
 				}
 				return false;
 			});
+		$('<div class="clearfix"></div>').appendTo(this.$wrapper);
 	}
 });
 

frappe/public/js/frappe/model/model.js

@@ -111,9 +111,10 @@ $.extend(frappe.model, {
 	},
 	
 	get_server_module_name: function(doctype) {
-		var dt = frappe.model.scrub(doctype)
-		return frappe.model.scrub(locals.DocType[doctype].module)
-			+ '.doctype.' + dt + '.' + dt;
+		var dt = frappe.model.scrub(doctype);
+		var module = frappe.model.scrub(locals.DocType[doctype].module);
+		var app = frappe.boot.module_app[module];
+		return app + "." + module + '.doctype.' + dt + '.' + dt;
 	},
 	
 	scrub: function(txt) {

frappe/public/js/frappe/ui/tree.js

@@ -123,8 +123,9 @@ frappe.ui.TreeNode = Class.extend({
 			if(item.condition) {
 				if(!item.condition(me)) return;
 			}
+			var label = item.get_label ? item.get_label() : item.label;
 			var link = $("<a class='tree-toolbar-item'>")
-				.html(item.get_label ? item.get_label() : item.label)
+				.html(label)
 				.appendTo(me.toolbar)
 				.click(function() { item.click(me, this); return false; });
 				

frappe/public/js/frappe/views/moduleview.js

@@ -189,7 +189,7 @@ frappe.views.moduleview.ModuleView = Class.extend({
 							frappe.set_route("List", item.name)
 						} 
 						else if(item.type==="page") {
-							frappe.set_route(item.route || item.name);
+							frappe.set_route(item.route || item.link || item.name);
 						}
 						else if(item.type==="report") {
 							if(item.is_query_report) {