Explorar el Código

[fix] filter_dashboard naming #3158 #3128

version-14
Rushabh Mehta hace 8 años
padre
commit
b6c36a67b0
Se han modificado 2 ficheros con 5 adiciones y 5 borrados
  1. +3
    -3
      frappe/public/js/frappe/ui/filters/filter_dashboard_head.html
  2. +2
    -2
      frappe/public/js/frappe/ui/filters/filters.js

+ 3
- 3
frappe/public/js/frappe/ui/filters/filter_dashboard_head.html Ver fichero

@@ -1,6 +1,6 @@
<div class="filter-dash-item"> <div class="filter-dash-item">
<div class="filter-header"> <div class="filter-header">
<h6 class="h6 filter-label" data-name="{{ label }}">{{ label }}</h6>
<h6 class="h6 filter-label" data-name="{{ field }}">{{ label }}</h6>
{% if (type!=="Date" && type!=="Datetime" && type!=="DateRange") { %} {% if (type!=="Date" && type!=="Datetime" && type!=="DateRange") { %}
<div class="dropdown search-dropdown hide pull-right"> <div class="dropdown search-dropdown hide pull-right">
<i class="dropdown-toggle octicon octicon-search text-muted" <i class="dropdown-toggle octicon octicon-search text-muted"
@@ -14,7 +14,7 @@
<div class="dropdown sort-dropdown pull-right"> <div class="dropdown sort-dropdown pull-right">
<i class="pull-right dropdown-toggle <i class="pull-right dropdown-toggle
filter-sort-active octicon octicon-gear text-muted" filter-sort-active octicon octicon-gear text-muted"
data-name="{{ label }}" data-sort-by="number" data-order="desc"
data-name="{{ field }}" data-sort-by="number" data-order="desc"
data-toggle="dropdown"/> data-toggle="dropdown"/>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li class="filter-sort-item" data-sort-by="alphabet" data-order="asc"> <li class="filter-sort-item" data-sort-by="alphabet" data-order="asc">
@@ -34,7 +34,7 @@
<div class="filter-input filter-input-date" data-name="{{ field }}"> <div class="filter-input filter-input-date" data-name="{{ field }}">
</div> </div>
{% } else { %} {% } else { %}
<ul class="list-unstyled sidebar-menu filter-stat" data-name="{{ label }}">
<ul class="list-unstyled sidebar-menu filter-stat" data-name="{{ field }}">


</ul> </ul>
{% } %} {% } %}

+ 2
- 2
frappe/public/js/frappe/ui/filters/filters.js Ver fichero

@@ -117,7 +117,7 @@ frappe.ui.FilterList = Class.extend({
return return
} }


var active = this.wrapper.find(".filter-sort-active[data-name='"+__(field.label)+"']");
var active = this.wrapper.find(".filter-sort-active[data-name='"+__(field.name)+"']");


// sort filters // sort filters
if(active.attr('data-sort-by')==='alphabet') { if(active.attr('data-sort-by')==='alphabet') {
@@ -168,7 +168,7 @@ frappe.ui.FilterList = Class.extend({
label: __(field.label), label: __(field.label),
labels:labels labels:labels
}; };
var dashboard_filter = this.wrapper.find(".filter-stat[data-name='" + __(field.label) + "']")
var dashboard_filter = this.wrapper.find(".filter-stat[data-name='" + __(field.name) + "']")
dashboard_filter.html(frappe.render_template("filter_dashboard_value", context)) dashboard_filter.html(frappe.render_template("filter_dashboard_value", context))
.on("click", ".filter-stat-link", function() { .on("click", ".filter-stat-link", function() {
var fieldname = $(this).attr('data-field'); var fieldname = $(this).attr('data-field');


Cargando…
Cancelar
Guardar