瀏覽代碼

[fix] for building help

version-14
Rushabh Mehta 9 年之前
父節點
當前提交
c034750708
共有 4 個檔案被更改,包括 13 行新增15 行删除
  1. +1
    -0
      frappe/commands/utils.py
  2. +3
    -3
      frappe/public/js/frappe/ui/toolbar/navbar.html
  3. +3
    -6
      frappe/utils/help.py
  4. +6
    -6
      frappe/utils/jinja.py

+ 1
- 0
frappe/commands/utils.py 查看文件

@@ -388,6 +388,7 @@ def setup_help():
"Make a database for help documentation"
frappe.local.flags = frappe._dict()
frappe.local.flags.in_setup_help = True
frappe.local.flags.in_install = True
frappe.local.lang = 'en'
frappe.local.conf = frappe.get_site_config(sites_path='.')
from frappe.utils.help import sync


+ 3
- 3
frappe/public/js/frappe/ui/toolbar/navbar.html 查看文件

@@ -39,20 +39,20 @@
<li class="dropdown dropdown-help dropdown-mobile">
<a class="dropdown-toggle" data-toggle="dropdown" href="#"
onclick="return false;" style="height: 40px;">
<span class="hidden-xs hidden-sm" style="vertical-align: middle;">Help <b class="caret"></b></span>
<span class="hidden-xs hidden-sm" style="vertical-align: middle;">{{ __("Help") }} <b class="caret"></b></span>
<span class="visible-xs visible-sm standard-image"
style="padding: 50% 7px; font-size: 17px; background-color: #fafbfc; font-weight: 100;">?</span>
</a>
<ul class="dropdown-menu" role="menu">
<div class="input-group" style="border-bottom: 1px solid #d1d8dd;">
<input id="input-help" type="text" placeholder="What do you need help with?" autofocus>
<span class="input-group-btn"><button class="btn btn-default">Go</button></span>
<span class="input-group-btn"><button class="btn btn-default">{{ __("Go") }}</button></span>
</div>
<li id="help-links"></li>
<li class="divider"></li>
<li>
<a data-link-type="documentation"
data-path="/documentation/index" target="_blank">Documentation</a>
data-path="/documentation/index" target="_blank">{{ __("Documentation") }}</a>
</li>
<li class="divider documentation-links"></li>
<li><a href="#" onclick="return frappe.ui.toolbar.show_about();">


+ 3
- 6
frappe/utils/help.py 查看文件

@@ -94,12 +94,9 @@ class HelpDatabase(object):
docs_folder = '../apps/{app}/{app}/docs/user'.format(app=app)
self.out_base_path = '../apps/{app}/{app}/docs'.format(app=app)
if os.path.exists(docs_folder):
try:
app_name = frappe.get_attr('{app}.__title__'.format(app=app)) or app
doc_contents += '<li><a data-path="/{app}/index">{app_name}</a></li>'.format(
app=app, app_name=app_name)
except Exception:
pass
app_name = getattr(frappe.get_module(app), '__title__', None) or app.title()
doc_contents += '<li><a data-path="/{app}/index">{app_name}</a></li>'.format(
app=app, app_name=app_name)

for basepath, folders, files in os.walk(docs_folder):
files = self.reorder_files(files)


+ 6
- 6
frappe/utils/jinja.py 查看文件

@@ -70,7 +70,7 @@ def get_allowed_functions_for_jenv():
# only allow functions
datautils[key] = obj

if "_" in frappe.local.form_dict:
if "_" in getattr(frappe.local, 'form_dict', {}):
del frappe.local.form_dict["_"]

out = {
@@ -80,15 +80,11 @@ def get_allowed_functions_for_jenv():
"get_url": frappe.utils.get_url,
"format_value": frappe.format_value,
"format_date": frappe.utils.data.global_date_format,
"form_dict": frappe.local.form_dict,
"form_dict": getattr(frappe.local, 'form_dict', {}),
"local": frappe.local,
"get_hooks": frappe.get_hooks,
"get_meta": frappe.get_meta,
"get_doc": frappe.get_doc,
"db": {
"get_value": frappe.db.get_value,
"get_default": frappe.db.get_default,
},
"get_list": frappe.get_list,
"get_all": frappe.get_all,
"utils": datautils,
@@ -113,6 +109,10 @@ def get_allowed_functions_for_jenv():
if not frappe.flags.in_setup_help:
out['date_format'] = frappe.db.get_default("date_format") or "yyyy-mm-dd"
out['get_visible_columns'] = frappe.get_attr("frappe.www.print.get_visible_columns")
out["db"] = {
"get_value": frappe.db.get_value,
"get_default": frappe.db.get_default,
}

return out



Loading…
取消
儲存