diff --git a/src/main/java/sirius/biz/tenants/TenantSearchProvider.java b/src/main/java/sirius/biz/tenants/TenantSearchProvider.java index b248ad1a7..55871b34e 100644 --- a/src/main/java/sirius/biz/tenants/TenantSearchProvider.java +++ b/src/main/java/sirius/biz/tenants/TenantSearchProvider.java @@ -83,6 +83,6 @@ public void query(String query, int maxResults, Consumer resul @Override public int getPriority() { - return 110; + return 100; } } diff --git a/src/main/java/sirius/biz/tenants/UserAccountSearchProvider.java b/src/main/java/sirius/biz/tenants/UserAccountSearchProvider.java index 0ced63345..545e9c1b2 100644 --- a/src/main/java/sirius/biz/tenants/UserAccountSearchProvider.java +++ b/src/main/java/sirius/biz/tenants/UserAccountSearchProvider.java @@ -111,6 +111,6 @@ public void query(String query, int maxResults, Consumer resul @Override public int getPriority() { - return 100; + return 110; } } diff --git a/src/main/java/sirius/biz/tycho/search/OpenSearchController.java b/src/main/java/sirius/biz/tycho/search/OpenSearchController.java index 23ca06ec9..90631d352 100644 --- a/src/main/java/sirius/biz/tycho/search/OpenSearchController.java +++ b/src/main/java/sirius/biz/tycho/search/OpenSearchController.java @@ -27,6 +27,7 @@ import sirius.web.controller.Routed; import sirius.web.http.WebContext; import sirius.web.security.LoginRequired; +import sirius.web.security.Permission; import sirius.web.services.JSONStructuredOutput; import java.io.IOException; @@ -56,7 +57,7 @@ public class OpenSearchController extends BizController { /** - * Contains the framework which controls of the system wide search / open search is pvoided or not. + * Contains the framework which controls of the system wide search / open search is provided or not. */ public static final String FRAMEWORK_TYCHO_OPEN_SEARCH = "tycho.open-search"; @@ -119,6 +120,7 @@ public class OpenSearchController extends BizController { */ @Routed("/open-search") @LoginRequired + @Permission("permission-open-search") public void search(WebContext webContext) { webContext.respondWith() .template("/templates/biz/tycho/search/search.html.pasta", webContext.get(PARAM_QUERY).asString()); @@ -132,6 +134,7 @@ public void search(WebContext webContext) { */ @Routed("/open-search/api") @LoginRequired + @Permission("permission-open-search") public Future searchAPI(WebContext webContext) { webContext.markAsLongCall(); diff --git a/src/main/java/sirius/biz/tycho/search/OpenSearchResult.java b/src/main/java/sirius/biz/tycho/search/OpenSearchResult.java index 15715e8cd..cba2ed5bd 100644 --- a/src/main/java/sirius/biz/tycho/search/OpenSearchResult.java +++ b/src/main/java/sirius/biz/tycho/search/OpenSearchResult.java @@ -14,6 +14,7 @@ import sirius.kernel.health.Exceptions; import sirius.kernel.health.Log; import sirius.pasta.noodle.compiler.CompileException; +import sirius.pasta.noodle.sandbox.SandboxMode; import sirius.pasta.tagliatelle.Tagliatelle; import sirius.pasta.tagliatelle.Template; import sirius.pasta.tagliatelle.compiler.TemplateCompilationContext; @@ -79,8 +80,10 @@ public OpenSearchResult withDescription(String description) { */ public OpenSearchResult withTemplateFromCode(String template, Object... args) { try { - TemplateCompilationContext context = - tagliatelle.createInlineCompilationContext("OpenSearchResult", template, null); + TemplateCompilationContext context = tagliatelle.createInlineCompilationContext("OpenSearchResult", + template, + SandboxMode.DISABLED, + null); TemplateCompiler templateCompiler = new TemplateCompiler(context); templateCompiler.compile(); this.htmlDescription = context.getTemplate().renderToString(args); diff --git a/src/main/resources/component-070-biz.conf b/src/main/resources/component-070-biz.conf index 142ede7bc..3e2a49810 100644 --- a/src/main/resources/component-070-biz.conf +++ b/src/main/resources/component-070-biz.conf @@ -1432,6 +1432,8 @@ security { permission-view-audit-log : "Required to view the audit log" permission-unlock-files : "Required to unlock read-only files" + permission-open-search : "Required to use the open-search" + feature-bypass-process-log-limits : "Required to bypass log limits of processes via a job parameter" # legacy storage framework... @@ -1462,6 +1464,7 @@ security { permission-view-files = true permission-view-processes = true permission-view-audit-log = true + permission-open-search = true } # If a user belongs to the system tenant, we set the member&affiliate flag diff --git a/src/main/resources/default/extensions/tycho-page-menu/menu.html.pasta b/src/main/resources/default/extensions/tycho-page-menu/menu.html.pasta index 63868e7ee..abb279dbc 100644 --- a/src/main/resources/default/extensions/tycho-page-menu/menu.html.pasta +++ b/src/main/resources/default/extensions/tycho-page-menu/menu.html.pasta @@ -10,22 +10,24 @@ -
  • -
    - - -
    -
    • -
  • - - - @i18n('OpenSearchController.label') - -
    • + +
  • +
    + + +
    +
    • +
  • + + + @i18n('OpenSearchController.label') + +
    • +     - + -
  • -
    - - -
    -
    • + +
  • +
    + + +
    +
    • +     - + @sirius.kernel.info.Product.getProduct().getName()

    Welcome to the knowledge base of @sirius.kernel.info.Product.getProduct().getName()

    - This provides you with an overview of all articles and tutorials we provide. Please note that you can use the - to find articles for a given - keyword. + Here you will find an overview of all the help pages and instructions we provide for you. + Please note that matching articles and tutorials are directly shown in the applications. Lookout for this + symbol in the upper right area. - Also note that matching articles and tutorials are also directly shown in the applications. Lookout for this - symbol im in the upper right area. + + + Also note that you can use the + + to find articles for a given keyword. + + Keep in mind that articles are only visible to authenticated users with the appropriate permissions. If you want to forward a link to an article who doesn't have access to the system, use this button, which will generated diff --git a/src/main/resources/default/templates/biz/tycho/kb/welcome_de.html.pasta b/src/main/resources/default/templates/biz/tycho/kb/welcome_de.html.pasta index c0571bc7b..666778cee 100644 --- a/src/main/resources/default/templates/biz/tycho/kb/welcome_de.html.pasta +++ b/src/main/resources/default/templates/biz/tycho/kb/welcome_de.html.pasta @@ -1,19 +1,27 @@

    - + @sirius.kernel.info.Product.getProduct().getName()

    -Willkommen in der Knowledge Base von @sirius.kernel.info.Product.getProduct().getName() + Willkommen in der Knowledge Base von @sirius.kernel.info.Product.getProduct().getName()

    - Hier finden Sie eine Übersicht über alle Hilfeseiten und Anleitungen die wir für Sie bereitstellen. Bitte beachten - Sie, dass Sie auch die verwenden - können, um entsprechende Hilfeseiten zu finden. - - Passende Anleitungen oder Erklärungen finden Sie auch direkt in den Anwendungen. Achten Sie hierfür auf dieses + Hier finden Sie eine Übersicht über alle Hilfeseiten und Anleitungen die wir für Sie bereitstellen. + Passende Anleitungen oder Erklärungen finden Sie direkt in den Anwendungen. Achten Sie hierfür auf dieses Symbol im rechten oberen Bereich. - Bitte beachten Sie, dass einige Hilfeseiten nur mit einer entsprechenden Berechtigung und nach einem Login sichtbar + + + Bitte beachten Sie, dass Sie auch die + + verwenden können, um entsprechende Hilfeseiten zu finden. + + + + Bitte beachten Sie, dass einige Hilfeseiten nur mit einer entsprechenden Berechtigung und nach einem Login + sichtbar sind. Wenn Sie eine Hilfeseite an weitere Personen versenden möchten, nutzen Sie hierfür den Button im rechten oberen Bereich.

    diff --git a/src/main/resources/default/templates/biz/tycho/search/search.html.pasta b/src/main/resources/default/templates/biz/tycho/search/search.html.pasta index d0a0142f0..f1493728d 100644 --- a/src/main/resources/default/templates/biz/tycho/search/search.html.pasta +++ b/src/main/resources/default/templates/biz/tycho/search/search.html.pasta @@ -75,7 +75,7 @@ if (!_category) { _auxiliary.innerHTML = Mustache.render('' + '
    ' + - '

    {{category}}

    ' + + '

    {{category}}

    ' + '
    ' , node); _category = _auxiliary.childNodes[0];