Quellcode durchsuchen

[fix] remove filter

version-14
Rushabh Mehta vor 7 Jahren
Ursprung
Commit
630d30d89a
2 geänderte Dateien mit 21 neuen und 1 gelöschten Zeilen
  1. +16
    -1
      frappe/public/js/frappe/ui/filters/filters.js
  2. +5
    -0
      socketio.js

+ 16
- 1
frappe/public/js/frappe/ui/filters/filters.js Datei anzeigen

@@ -128,6 +128,19 @@ frappe.ui.FilterList = Class.extend({
return filter;
},

remove: function(filter) {
// remove `filter` from flist
for (var i in this.filters) {
if (this.filters[i] === filter) {
break;
}
}
if (i!==undefined) {
// remove index
this.splice(i, 1);
}
},

filter_exists: function(doctype, fieldname, condition, value) {
var flag = false;
for(var i in this.filters) {
@@ -261,9 +274,11 @@ frappe.ui.Filter = Class.extend({

apply: function() {
var f = this.get_value();
this.flist.filters.pop();

this.flist.remove(this);
this.flist.push_new_filter(f[0], f[1], f[2], f[3]);
this.wrapper.remove();
this.flist.update_filters();
},

remove: function(dont_run) {


+ 5
- 0
socketio.js Datei anzeigen

@@ -38,6 +38,11 @@ io.on('connection', function(socket) {
}

// console.log("connection!");
if (!socket.request.headers.cookie) {
return;
}


var sid = cookie.parse(socket.request.headers.cookie).sid
if(!sid) {
return;


Laden…
Abbrechen
Speichern