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

chore: rename from app to desk

Browse source
This commit is contained in:
sokumon 2025-11-09 13:47:07 +05:30
parent befa024365
commit 49714e916f
17 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/apps.py
View file

@ -81,7 +81,7 @@ def get_default_path():
if len(_apps) == 1: if len(_apps) == 1:
return _apps[0].get("route") or "/apps" return _apps[0].get("route") or "/apps"
elif is_desk_apps(_apps): elif is_desk_apps(_apps):
return "/app" return "/desk"
return "/apps" return "/apps"

2
frappe/auth.py
View file

@ -201,7 +201,7 @@ class LoginManager:
frappe.local.cookie_manager.set_cookie("system_user", "yes", deduplicate=True) frappe.local.cookie_manager.set_cookie("system_user", "yes", deduplicate=True)
if not resume: if not resume:
frappe.local.response["message"] = "Logged In" frappe.local.response["message"] = "Logged In"
frappe.local.response["home_page"] = get_default_path() or "/app" frappe.local.response["home_page"] = get_default_path() or "/desk"
if not resume: if not resume:
frappe.response["full_name"] = self.full_name frappe.response["full_name"] = self.full_name

2
frappe/core/doctype/user/test_user.py
View file

@ -375,7 +375,7 @@ class TestUser(IntegrationTestCase):
frappe.set_user("testpassword@example.com") frappe.set_user("testpassword@example.com")
test_user = frappe.get_doc("User", "testpassword@example.com") test_user = frappe.get_doc("User", "testpassword@example.com")
key = self.reset_password(test_user) key = self.reset_password(test_user)
self.assertEqual(update_password(new_password, key=key), "/app") self.assertEqual(update_password(new_password, key=key), "/desk")
self.assertEqual( self.assertEqual(
update_password(new_password, key="wrong_key"), update_password(new_password, key="wrong_key"),
"The reset password link has either been used before or is invalid", "The reset password link has either been used before or is invalid",

2
frappe/core/doctype/user/user.py
View file

@ -951,7 +951,7 @@ def update_password(
frappe.db.set_value("User", user, "reset_password_key", "") frappe.db.set_value("User", user, "reset_password_key", "")
if user_doc.user_type == "System User": if user_doc.user_type == "System User":
return get_default_path() or "/app" return get_default_path() or "/desk"
else: else:
return redirect_url or get_default_path() or get_home_page() return redirect_url or get_default_path() or get_home_page()

2
frappe/custom/doctype/client_script/ui_test_client_script.js
View file

@ -1,7 +1,7 @@
context("Client Script", () => { context("Client Script", () => {
before(() => { before(() => {
cy.login(); cy.login();
cy.visit("/app"); cy.visit("/desk");
}); });
it("should run form script in doctype form", () => { it("should run form script in doctype form", () => {

4
frappe/desk/page/setup_wizard/setup_wizard.js
View file

@ -32,7 +32,7 @@ frappe.setup = {
frappe.pages["setup-wizard"].on_page_load = function (wrapper) { frappe.pages["setup-wizard"].on_page_load = function (wrapper) {
if (frappe.boot.setup_complete) { if (frappe.boot.setup_complete) {
window.location.href = frappe.boot.apps_data.default_path || "/app"; window.location.href = frappe.boot.apps_data.default_path || "/desk";
} }
let requires = frappe.boot.setup_wizard_requires || []; let requires = frappe.boot.setup_wizard_requires || [];
frappe.require(requires, function () { frappe.require(requires, function () {
@ -219,7 +219,7 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides {
localStorage.current_route = ""; localStorage.current_route = "";
localStorage.current_app = ""; localStorage.current_app = "";
window.location.href = current_route || frappe.boot.apps_data.default_path || "/app"; window.location.href = current_route || frappe.boot.apps_data.default_path || "/desk";
}, 2000); }, 2000);
} }

2
frappe/integrations/google_oauth.py
View file

@ -173,7 +173,7 @@ def callback(state: str, code: str | None = None, error: str | None = None) -> N
along with committing and redirecting us back to frappe site.""" along with committing and redirecting us back to frappe site."""
state = json.loads(state) state = json.loads(state)
redirect = state.pop("redirect", "/app") redirect = state.pop("redirect", "/desk")
success_query_param = state.pop("success_query_param", "") success_query_param = state.pop("success_query_param", "")
failure_query_param = state.pop("failure_query_param", "") failure_query_param = state.pop("failure_query_param", "")

2
frappe/public/js/frappe/ui/dialog.js
View file

@ -249,7 +249,7 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup {
show() { show() {
// show it // show it
if (window.location.pathname.startsWith("/app")) { if (window.location.pathname.startsWith("/desk")) {
this.handle_focus(); this.handle_focus();
} }

2
frappe/public/js/frappe/ui/toolbar/navbar.html
View file

@ -1,7 +1,7 @@
<div class="sticky-top"> <div class="sticky-top">
<header class="navbar navbar-expand" role="navigation"> <header class="navbar navbar-expand" role="navigation">
<div class="container"> <div class="container">
<a class="navbar-brand navbar-home" href="/app"> <a class="navbar-brand navbar-home" href="/desk">
<img <img
class="app-logo" class="app-logo"
src="{{ frappe.boot.app_data[0].app_logo_url }}" src="{{ frappe.boot.app_data[0].app_logo_url }}"

2
frappe/public/js/frappe/views/breadcrumbs.js
View file

@ -113,7 +113,7 @@ frappe.breadcrumbs = {
} }
this.append_breadcrumb_element( this.append_breadcrumb_element(
`/app/${frappe.router.slug(breadcrumbs.workspace)}`, `/desk/${frappe.router.slug(breadcrumbs.workspace)}`,
__(breadcrumbs.workspace) __(breadcrumbs.workspace)
); );
}, },

2
frappe/public/js/frappe/views/pageview.js
View file

@ -147,7 +147,7 @@ frappe.show_message_page = function (opts) {
<div class="text-center message-page-content">\ <div class="text-center message-page-content">\
%(img)s\ %(img)s\
<p class="lead">%(message)s</p>\ <p class="lead">%(message)s</p>\
<a class="btn btn-default btn-sm btn-home" href="/app">%(home)s</a>\ <a class="btn btn-default btn-sm btn-home" href="/desk">%(home)s</a>\
</div>\ </div>\
</div>', </div>',
{ {

2
frappe/templates/includes/navbar/navbar_login.html
View file

@ -14,7 +14,7 @@
</a> </a>
{%- endif -%} {%- endif -%}
{%- endfor -%} {%- endfor -%}
<a class="dropdown-item switch-to-desk hidden" href="/app">{{ _('Switch To Desk') }}</a> <a class="dropdown-item switch-to-desk hidden" href="/desk">{{ _('Switch To Desk') }}</a>
<a class="dropdown-item apps hidden" href="/apps">{{ _('Apps') }}</a> <a class="dropdown-item apps hidden" href="/apps">{{ _('Apps') }}</a>
</ul> </ul>
</li> </li>

2
frappe/templates/pages/integrations/gcalendar-success.html
View file

@ -9,7 +9,7 @@
{{ _("Success") }}</span> {{ _("Success") }}</span>
</div> </div>
<p>{{ _("Your connection request to Google Calendar was successfully accepted") }}</p> <p>{{ _("Your connection request to Google Calendar was successfully accepted") }}</p>
<div><a href='{{ "/app" }}' class='btn btn-primary btn-sm'> <div><a href='{{ "/desk" }}' class='btn btn-primary btn-sm'>
{{ _("Back to Desk") }}</a></div> {{ _("Back to Desk") }}</a></div>
</div> </div>
<style> <style>

2
frappe/tests/test_perf.py
View file

@ -154,7 +154,7 @@ class TestPerformance(IntegrationTestCase):
) )
def test_homepage_resolver(self): def test_homepage_resolver(self):
paths = ["/", "/app"] paths = ["/", "/desk"]
for path in paths: for path in paths:
PathResolver(path).resolve() PathResolver(path).resolve()
with self.assertQueryCount(1): with self.assertQueryCount(1):

2
frappe/website/page_renderers/not_permitted_page.py
View file

@ -17,7 +17,7 @@ class NotPermittedPage(TemplatePage):
def render(self): def render(self):
action = f"/login?redirect-to={quote_plus(frappe.request.path)}" action = f"/login?redirect-to={quote_plus(frappe.request.path)}"
if frappe.request.path.startswith("/app/") or frappe.request.path == "/app": if frappe.request.path.startswith("/app/") or frappe.request.path == "/desk":
action = "/login" action = "/login"
frappe.local.message_title = _("Not Permitted") frappe.local.message_title = _("Not Permitted")
frappe.local.response["context"] = dict( frappe.local.response["context"] = dict(

2
frappe/www/apps.py
View file

@ -14,7 +14,7 @@ def get_context():
default_app = user_default_app if user_default_app else system_default_app default_app = user_default_app if user_default_app else system_default_app
if len(all_apps) == 0: if len(all_apps) == 0:
frappe.local.flags.redirect_location = "/app" frappe.local.flags.redirect_location = "/desk"
raise frappe.Redirect raise frappe.Redirect
for app in all_apps: for app in all_apps:

4
frappe/www/login.py
View file

@ -34,7 +34,7 @@ def get_context(context):
if frappe.session.data.user_type == "Website User": if frappe.session.data.user_type == "Website User":
redirect_to = get_default_path() or get_home_page() redirect_to = get_default_path() or get_home_page()
else: else:
redirect_to = get_default_path() or "/app" redirect_to = get_default_path() or "/desk"
if redirect_to != "login": if redirect_to != "login":
frappe.local.flags.redirect_location = redirect_to frappe.local.flags.redirect_location = redirect_to
@ -215,7 +215,7 @@ def sanitize_redirect(redirect: str | None) -> str | None:
) )
if parsed_redirect.netloc: if parsed_redirect.netloc:
if parsed_request_host.netloc != parsed_redirect.netloc: if parsed_request_host.netloc != parsed_redirect.netloc:
output_parsed_url = output_parsed_url._replace(path="/app") output_parsed_url = output_parsed_url._replace(path="/desk")
else: else:
output_parsed_url = output_parsed_url._replace(path=parsed_redirect.path) output_parsed_url = output_parsed_url._replace(path=parsed_redirect.path)