vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'hotfix'

Browse source
This commit is contained in:
Saurabh 2018-01-24 19:35:01 +05:30
commit 9ee8678bcb
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
__version__ = '10.0.14'
__version__ = '10.0.15'
__title__ = "Frappe Framework"
local = Local()

7
frappe/public/js/frappe/ui/page.js
View file

@ -263,7 +263,7 @@ frappe.ui.Page = Class.extend({
var $li = $('<li><a class="grey-link">'+ label +'</a><li>'),
$link = $li.find("a").on("click", click);
if (this.is_in_group_button_dropdown(parent, `${item_selector}:contains('${label}')`, label)) return;
if (this.is_in_group_button_dropdown(parent, item_selector, label)) return;
if(standard===true) {
$li.appendTo(parent);
@ -289,7 +289,10 @@ frappe.ui.Page = Class.extend({
if (!label || !parent) return false;
const result = $(parent).find(`${selector}:contains('${label}')`);
const result = $(parent).find(`${selector}:contains('${label}')`)
.filter(function() {
return $(this).text() === label;
});
return result.length > 0;
},