Przeglądaj źródła

Merge pull request #18098 from frappe/mergify/bp/version-14-hotfix/pr-18089

fix: sync app dashboard on app install (backport #18089)
version-14
Ankush Menat 2 lat temu
committed by GitHub
rodzic
commit
291af1ffe7
Nie znaleziono w bazie danych klucza dla tego podpisu ID klucza GPG: 4AEE18F83AFDEB23
4 zmienionych plików z 7 dodań i 9 usunięć
  1. +3
    -0
      frappe/commands/site.py
  2. +2
    -0
      frappe/installer.py
  3. +2
    -7
      frappe/utils/dashboard.py
  4. +0
    -2
      frappe/utils/fixtures.py

+ 3
- 0
frappe/commands/site.py Wyświetl plik

@@ -420,6 +420,9 @@ def install_app(context, apps, force=False):
print(f"An error occurred while installing {app}{err_msg}")
exit_code = 1

if not exit_code:
frappe.db.commit()

frappe.destroy()

sys.exit(exit_code)


+ 2
- 0
frappe/installer.py Wyświetl plik

@@ -11,6 +11,7 @@ import click
import frappe
from frappe.defaults import _clear_cache
from frappe.utils import cint, is_git_url
from frappe.utils.dashboard import sync_dashboards


def _is_scheduler_enabled() -> bool:
@@ -301,6 +302,7 @@ def install_app(name, verbose=False, set_as_patched=True, force=False):
sync_jobs()
sync_fixtures(name)
sync_customizations(name)
sync_dashboards(name)

for after_sync in app_hooks.after_sync or []:
frappe.get_attr(after_sync)() #


+ 2
- 7
frappe/utils/dashboard.py Wyświetl plik

@@ -84,13 +84,8 @@ def get_dashboards_with_link(docname, doctype):


def sync_dashboards(app=None):
"""Import, overwrite fixtures from `[app]/fixtures`"""
if not cint(frappe.db.get_single_value("System Settings", "setup_complete")):
return
if app:
apps = [app]
else:
apps = frappe.get_installed_apps()
"""Import, overwrite dashboards from `[app]/[app]_dashboard`"""
apps = [app] if app else frappe.get_installed_apps()

for app_name in apps:
print(f"Updating Dashboard for {app_name}")


+ 0
- 2
frappe/utils/fixtures.py Wyświetl plik

@@ -25,8 +25,6 @@ def sync_fixtures(app=None):

frappe.flags.in_fixtures = False

frappe.db.commit()


def import_custom_scripts(app):
"""Import custom scripts from `[app]/fixtures/custom_scripts`"""


Ładowanie…
Anuluj
Zapisz