Merge branch 'responsive' of github.com:webnotes/wnframework into responsive

This commit is contained in:
Anand Doshi 2013-07-05 12:57:21 +05:30
commit 36d570aaa3
4 changed files with 8 additions and 7 deletions

View file

@ -155,7 +155,7 @@ wn.ui.form.GridRow = Class.extend({
make: function() {
var me = this;
this.wrapper = $('<div class="grid-row">\
<div class="data-row" style="min-height: 15px;"></div>\
<div class="data-row" style="min-height: 20px;"></div>\
<div class="panel panel-warning" style="display: none;">\
<div class="panel-heading">\
<div class="toolbar" style="height: 36px;">\
@ -188,7 +188,6 @@ wn.ui.form.GridRow = Class.extend({
this.wrapper.find(".data-row, .panel-heading")
.click(function() {
me.toggle_view();
return false;
});
this.set_button_events();
}
@ -288,6 +287,9 @@ wn.ui.form.GridRow = Class.extend({
this.show = show===undefined ?
show = !this.show :
show
// call blur
document.activeElement && document.activeElement.blur()
if(show && open_row) {
if(open_row==this) {

View file

@ -64,7 +64,7 @@ wn.utils = {
},
set_intro: function(me, wrapper, txt) {
if(!me.intro_area) {
me.intro_area = $('<div class="alert form-intro-area" style="margin-top: 20px;">')
me.intro_area = $('<div class="alert alert-info form-intro-area">')
.prependTo(wrapper);
}
if(txt) {

View file

@ -20,7 +20,6 @@ wn.ui.Search = Class.extend({
var parent = $('<div class="row"><div class="col col-lg-12"></div></div>')
.appendTo(this.dialog.body)
.find(".col-lg-12")
.css({"padding": "0px"});
this.list = new wn.ui.Listing({
parent: parent,
appframe: this.dialog.appframe,

View file

@ -30,11 +30,11 @@ def get_mapped_doclist(from_doctype, from_docname, table_maps, target_doclist=[]
if isinstance(target_doclist, basestring):
target_doclist = json.loads(target_doclist)
if not webnotes.has_permission(from_doctype, from_docname):
webnotes.msgprint("No Permission", raise_exception=webnotes.PermissionError)
source = webnotes.bean(from_doctype, from_docname)
if not webnotes.has_permission(from_doctype, doc=source.doc):
webnotes.msgprint("No Permission", raise_exception=webnotes.PermissionError)
source_meta = webnotes.get_doctype(from_doctype)
target_meta = webnotes.get_doctype(table_maps[from_doctype]["doctype"])