Selaa lähdekoodia

[minor] [slickgrid] fixes #576 firefox issue

version-14
Rushabh Mehta 12 vuotta sitten
vanhempi
commit
11a61b49aa
3 muutettua tiedostoa jossa 3 lisäystä ja 7 poistoa
  1. +1
    -1
      core/doctype/doctype/doctype.py
  2. +1
    -5
      public/css/ui/common.css
  3. +1
    -1
      public/js/wn/views/query_report.js

+ 1
- 1
core/doctype/doctype/doctype.py Näytä tiedosto

@@ -224,7 +224,7 @@ def validate_fields(fields):
webnotes.msgprint("Minimum width for FieldType 'Currency' is 100px", raise_exception=1) webnotes.msgprint("Minimum width for FieldType 'Currency' is 100px", raise_exception=1)


def check_in_list_view(d): def check_in_list_view(d):
if d.in_list_view and d.fieldtype in no_value_fields:
if d.in_list_view and d.fieldtype!="Image" and (d.fieldtype in no_value_fields):
webnotes.msgprint("'In List View' not allowed for field of type '%s'" % d.fieldtype, raise_exception=1) webnotes.msgprint("'In List View' not allowed for field of type '%s'" % d.fieldtype, raise_exception=1)


for d in fields: for d in fields:


+ 1
- 5
public/css/ui/common.css Näytä tiedosto

@@ -332,7 +332,7 @@ div#freeze {
font-size: 12px; font-size: 12px;
} }


.slick-header, .slick-header * {
.slick-header-column {
-webkit-box-sizing: content-box; -webkit-box-sizing: content-box;
-moz-box-sizing: content-box; -moz-box-sizing: content-box;
box-sizing: content-box; box-sizing: content-box;
@@ -341,8 +341,6 @@ div#freeze {
.slick-headerrow-column { .slick-headerrow-column {
background: #87ceeb; background: #87ceeb;
text-overflow: clip; text-overflow: clip;
-moz-box-sizing: border-box;
box-sizing: border-box;
} }


.slick-headerrow-column input { .slick-headerrow-column input {
@@ -350,8 +348,6 @@ div#freeze {
padding: 0; padding: 0;
width: 100%; width: 100%;
min-height: 20px; min-height: 20px;
-moz-box-sizing: border-box;
box-sizing: border-box;
} }


.missing-image { .missing-image {


+ 1
- 1
public/js/wn/views/query_report.js Näytä tiedosto

@@ -169,7 +169,7 @@ wn.views.QueryReport = Class.extend({
render: function(result, columns) { render: function(result, columns) {
this.columnFilters = {}; this.columnFilters = {};
this.make_dataview(); this.make_dataview();
this.id = wn.dom.set_unique_id($(this.wrapper.find(".result-area")).get(0));
this.id = wn.dom.set_unique_id(this.wrapper.find(".result-area").get(0));
this.grid = new Slick.Grid("#"+this.id, this.dataView, this.columns, this.grid = new Slick.Grid("#"+this.id, this.dataView, this.columns,
this.slickgrid_options); this.slickgrid_options);


Ladataan…
Peruuta
Tallenna