')
+ // .appendTo(me.form_area);
+ //
+ // var col_spans = 6;
+ // if(row.parents(".form-column:first").hasClass("col-md-6"))
+ // col_spans = 12;
+ //
+ // var col1 = $('
').appendTo(row);
+ //
+ // return [col1, col2];
+ // },
+ // cols = make_row(),
+ // cnt = 0;
+ //
+ // $.each(me.docfields, function(ci, df) {
+ // if(!df.hidden) {
+ // if(df.fieldtype=="Section Break") {
+ // cols = make_row(df.label);
+ // cnt = 0;
+ // return;
+ // }
+ // var fieldwrapper = $('
')
+ // .appendTo(cols[cnt % 2])
+ // var fieldobj = make_field(df, me.parent_df.options,
+ // fieldwrapper.get(0), me.frm);
+ // fieldobj.docname = me.doc.name;
+ // fieldobj.refresh();
+ // fieldobj.input &&
+ // $(fieldobj.input).css({"max-height": "100px"});
+ //
+ // // set field properties
+ // // used for setting custom get queries in links
+ // if(me.grid.fieldinfo[df.fieldname])
+ // $.extend(fieldobj, me.grid.fieldinfo[df.fieldname]);
+ //
+ // me.fields.push(fieldobj);
+ // me.fields_dict[df.fieldname] = fieldobj;
+ // cnt++;
+ // }
+ // });
this.toggle_add_delete_button_display(this.wrapper.find(".panel:first"));
diff --git a/webnotes/public/js/wn/form/layout.js b/webnotes/public/js/wn/form/layout.js
index e74e5ffa95..4a7f424f6e 100644
--- a/webnotes/public/js/wn/form/layout.js
+++ b/webnotes/public/js/wn/form/layout.js
@@ -36,13 +36,15 @@ wn.ui.form.Layout = Class.extend({
this.wrapper.toggle(true);
}
},
- refresh: function() {
+ refresh: function(doc) {
var me = this;
+ if(doc) this.doc = doc;
$.each(this.fields_list, function(i, fieldobj) {
- if(me.frm) {
- fieldobj.docname = me.frm.docname;
- fieldobj.df = wn.meta.get_docfield(me.frm.doctype,
- fieldobj.df.fieldname, me.frm.docname);
+ if(me.doc) {
+ fieldobj.doctype = me.doc.doctype;
+ fieldobj.docname = me.doc.name;
+ fieldobj.df = wn.meta.get_docfield(me.doc.doctype,
+ fieldobj.df.fieldname, me.doc.name);
// on form change, permissions can change
fieldobj.perm = me.frm.perm;
};
diff --git a/webnotes/public/js/wn/model/model.js b/webnotes/public/js/wn/model/model.js
index d578f22cc4..90a104fa46 100644
--- a/webnotes/public/js/wn/model/model.js
+++ b/webnotes/public/js/wn/model/model.js
@@ -184,10 +184,10 @@ $.extend(wn.model, {
/* help: Set a value locally (if changed) and execute triggers */
if(!name) name = doctype;
var doc = locals[doctype] && locals[doctype][name] || null;
+
if(doc && doc[fieldname] !== value) {
doc[fieldname] = value;
- // trigger this after an interval since this will stop propogation
- setTimeout(10, function() { wn.model.trigger(fieldname, value, doc); });
+ wn.model.trigger(fieldname, value, doc);
return true;
} else {
// execute link triggers (want to reselect to execute triggers)
@@ -206,7 +206,7 @@ $.extend(wn.model, {
raise "CustomerAgeError";
}
}) */
-
+ console.log([doctype, fieldname])
wn.provide("wn.model.events." + doctype);
if(!wn.model.events[doctype][fieldname]) {
wn.model.events[doctype][fieldname] = [];
@@ -215,12 +215,13 @@ $.extend(wn.model, {
},
trigger: function(fieldname, value, doc) {
+
var run = function(events, event_doc) {
$.each(events || [], function(i, fn) {
fn && fn(fieldname, value, event_doc || doc);
});
};
-
+
if(wn.model.events[doc.doctype]) {
// field-level
diff --git a/webnotes/sessions.py b/webnotes/sessions.py
index 0d181c6eb6..a907df8379 100644
--- a/webnotes/sessions.py
+++ b/webnotes/sessions.py
@@ -151,8 +151,8 @@ class Session:
else:
self.start_as_guest()
- webnotes.local.lang = webnotes.cache().get_value("lang:" + data.user,
- lambda: webnotes.translate.get_user_lang(data.user))
+ webnotes.local.lang = webnotes.cache().get_value("lang:" + self.data.user,
+ lambda: webnotes.translate.get_user_lang(self.data.user))
def get_session_record(self):
"""get session record, or return the standard Guest Record"""
diff --git a/webnotes/core/templates/__init__.py b/webnotes/templates/__init__.py
similarity index 100%
rename from webnotes/core/templates/__init__.py
rename to webnotes/templates/__init__.py
diff --git a/webnotes/website/templates/base.html b/webnotes/templates/base.html
similarity index 86%
rename from webnotes/website/templates/base.html
rename to webnotes/templates/base.html
index 7708a81177..f119120f04 100644
--- a/webnotes/website/templates/base.html
+++ b/webnotes/templates/base.html
@@ -27,10 +27,10 @@
{% block banner %}{{ banner_html or "" }}{% endblock %}
- {% block navbar %}{% include "website/templates/includes/navbar.html" %}{% endblock %}
+ {% block navbar %}{% include "templates/includes/navbar.html" %}{% endblock %}
{% block content %}{% endblock %}
- {% block footer %}{% include "website/templates/includes/footer.html" %}{% endblock %}
+ {% block footer %}{% include "templates/includes/footer.html" %}{% endblock %}