瀏覽代碼

Merge branch 'hotfix'

version-14
Saurabh 7 年之前
父節點
當前提交
9ee8678bcb
共有 2 個檔案被更改,包括 6 行新增3 行删除
  1. +1
    -1
      frappe/__init__.py
  2. +5
    -2
      frappe/public/js/frappe/ui/page.js

+ 1
- 1
frappe/__init__.py 查看文件

@@ -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()


+ 5
- 2
frappe/public/js/frappe/ui/page.js 查看文件

@@ -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;
},



Loading…
取消
儲存