Skip to content

ESB-966 #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ffalqui wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

ESB-966 #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ The application will be available at http://localhost:8080/entando-de-app/

More information are available on [webapp README](webapp/README.md).

## Content Scheduler Plugin
## Optional CMS Plugins

The Content Scheduler Plugin is disabled by default. It can be included in the webapp activating the `contentscheduler` Maven profile during the build.
The Content Scheduler Plugin and the Content Workflow Plugin are disabled by default. They can be included in the webapp activating the `contentscheduler` and/or `contentworkflow` Maven profiles during the build.

## Testing

Expand Down
2 changes: 1 addition & 1 deletion admin-console/src/main/java/com/agiletec/apsadmin/admin/lang/lang.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<action name="add" class="langAction" method="add">
<result name="input" type="chain">list</result>
<result type="redirectAction">list</result>
<result type="redirectActionXF">list</result>
<interceptor-ref name="entandoDefaultStack"><param name="requestAuth.requiredPermission">superuser</param></interceptor-ref>
</action>

Expand Down
2 changes: 1 addition & 1 deletion admin-console/src/main/java/com/agiletec/apsadmin/admin/localestring/localeString.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

<action name="save" class="localeStringAction" method="save">
<result name="input" type="tiles">admin.LocaleString.entry</result>
<result type="redirectAction">list</result>
<result type="redirectActionXF">list</result>
<interceptor-ref name="entandoValidationStack"><param name="requestAuth.requiredPermission">superuser</param></interceptor-ref>
</action>

Expand Down
4 changes: 2 additions & 2 deletions admin-console/src/main/java/com/agiletec/apsadmin/category/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

<action name="save" class="categoryAction" method="save">
<result name="input" type="tiles">admin.Category.entry</result>
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">viewTree</param>
<param name="selectedNode">${categoryCode}</param>
</result>
Expand Down Expand Up @@ -94,7 +94,7 @@
</action>

<action name="executeMoveTree" class="categoryAction" method="executeMoveTree">
<result type="redirectAction">viewTree</result>
<result type="redirectActionXF">viewTree</result>
<result name="categoryTree" type="chain">viewTree</result>
<interceptor-ref name="entandoDefaultStack"><param name="requestAuth.requiredPermission">manageCategories</param></interceptor-ref>
</action>
Expand Down
2 changes: 1 addition & 1 deletion admin-console/src/main/java/com/agiletec/apsadmin/common/common.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<action name="doLogin" class="dispatchAction" method="doLogin">
<result name="input">/WEB-INF/apsadmin/jsp/common/login.jsp</result>
<result type="redirectAction">main</result>
<result type="redirectActionXF">main</result>
<interceptor-ref name="entandoLoginStack" />
</action>

Expand Down
32 changes: 16 additions & 16 deletions admin-console/src/main/java/com/agiletec/apsadmin/portal/page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@

<action name="delete" class="pageAction" method="delete">
<result name="references" type="tiles">admin.Page.references</result>
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">viewTree</param>
<param name="selectedNode">${selectedNode}</param>
</result>
Expand All @@ -262,7 +262,7 @@

<action name="save" class="pageAction" method="save">
<result name="input" type="tiles">admin.Page.entry</result>
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">viewTree</param>
<param name="selectedNode">${pageCode}</param>
</result>
Expand All @@ -274,7 +274,7 @@

<action name="saveConfigure" class="pageAction" method="saveAndConfigure">
<result name="input" type="tiles">admin.Page.entry</result>
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">configure</param>
<param name="pageCode">${selectedNode}</param>
</result>
Expand Down Expand Up @@ -311,7 +311,7 @@
<action name="doSetOffline" class="pageAction" method="doSetOffline">
<result name="references" type="tiles">admin.Page.references</result>
<result name="input" type="chain">viewTree</result>
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">viewTree</param>
<param name="selectedNode">${pageCode}</param>
</result>
Expand All @@ -331,7 +331,7 @@

<action name="doSetOnline" class="pageAction" method="doSetOnline">
<result name="input" type="chain">viewTree</result>
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">viewTree</param>
<param name="selectedNode">${pageCode}</param>
</result>
Expand All @@ -342,7 +342,7 @@
</action>

<action name="doConfigure" class="pageConfigAction" >
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">configure</param>
<param name="pageCode">${selectedNode}</param>
</result>
Expand All @@ -364,7 +364,7 @@

<action name="setDefaultWidgets" class="pageAction" method="setDefaultWidgets">
<result type="tiles">admin.Page.viewTreeMenu</result>
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">configure</param>
<param name="pageCode">${pageCode}</param>
</result>
Expand All @@ -376,7 +376,7 @@

<action name="setViewerPage" class="pageAction" method="setViewerPageAPI">
<result type="tiles">admin.Page.viewTreeMenu</result>
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">configure</param>
<param name="pageCode">${pageCode}</param>
</result>
Expand All @@ -391,7 +391,7 @@
<package name="core_do/Page/Console" namespace="/do/Page/Console" extends="core_do/ABSTRACT/Page">

<action name="viewTree" class="pageConfigAction" >
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">configure</param>
<param name="pageCode">${selectedNode}</param>
</result>
Expand All @@ -403,7 +403,7 @@

<action name="viewTreeMenu" class="pageTreeMenuAction" method="intro">
<result type="tiles">admin.Page.viewTreeMenu</result>
<result name="noRoot" type="redirectAction">
<result name="noRoot" type="redirectActionXF">
<param name="namespace">/do/Page</param>
<param name="actionName">viewTree</param>
</result>
Expand All @@ -423,7 +423,7 @@

<action name="configure" class="pageTreeMenuAction" method="intro">
<result type="tiles">admin.Page.viewTreeMenu</result>
<result name="noRoot" type="redirectAction">
<result name="noRoot" type="redirectActionXF">
<param name="namespace">/do/Page</param>
<param name="actionName">viewTree</param>
</result>
Expand Down Expand Up @@ -456,7 +456,7 @@
</action>

<action name="updateSystemParams" class="pageSettingsAction" method="updateSystemParams">
<result type="redirectAction">systemParams</result>
<result type="redirectActionXF">systemParams</result>
<interceptor-ref name="entandoDefaultStack">
<param name="requestAuth.requiredPermission">superuser</param>
</interceptor-ref>
Expand Down Expand Up @@ -515,7 +515,7 @@
</action>

<action name="search" class="pageFinderAction" method="search">
<result name="pageTree" type="redirectAction">viewTree</result>
<result name="pageTree" type="redirectActionXF">viewTree</result>
<result name="input" type="tiles">admin.Page.searchResult</result>
<result type="tiles">admin.Page.searchResult</result>
<interceptor-ref name="entandoValidationStack">
Expand Down Expand Up @@ -557,7 +557,7 @@
</action>

<action name="deleteWidgetFromPage" class="pageConfigAction" method="deleteWidget">
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">configure</param>
<param name="pageCode">${pageCode}</param>
</result>
Expand All @@ -568,7 +568,7 @@
</action>

<action name="moveWidgetUp" class="pageTreeAction" method="moveWidgetUp">
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">configure</param>
<param name="selectedNode">${selectedNode}</param>
</result>
Expand All @@ -578,7 +578,7 @@
</action>

<action name="moveWidgetDown" class="pageTreeAction" method="moveWidgetDown">
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">configure</param>
<param name="selectedNode">${selectedNode}</param>
</result>
Expand Down
2 changes: 1 addition & 1 deletion admin-console/src/main/java/com/agiletec/apsadmin/portal/specialwidget/specialWidget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<param name="namespace">/do/Page</param>
<param name="actionName">viewTree</param>
</result>
<result name="configure" type="redirectAction">
<result name="configure" type="redirectActionXF">
<param name="namespace">/do/Page</param>
<param name="actionName">configure</param>
<param name="pageCode">${pageCode}</param>
Expand Down
8 changes: 4 additions & 4 deletions admin-console/src/main/java/com/agiletec/apsadmin/portal/widgetType.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
</action>

<action name="deleteWidgetFromPage" class="pageConfigAction" method="deleteWidget">
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">viewWidgetUtilizers</param>
<param name="showletTypeCode">${showletTypeCode}</param>
</result>
Expand Down Expand Up @@ -131,12 +131,12 @@

<action name="save*" class="widgetTypeAction" method="save">
<result name="input" type="tiles">admin.Portal.showletType.entry</result>
<result name="replaceOnPage" type="redirectAction">
<result name="replaceOnPage" type="redirectActionXF">
<param name="namespace">/do/Page</param>
<param name="actionName">configure</param>
<param name="pageCode">${pageCode}</param>
</result>
<result type="redirectAction">viewWidgets</result>
<result type="redirectActionXF">viewWidgets</result>
<interceptor-ref name="entandoValidationStack">
<param name="requestAuth.requiredPermission">managePages</param>
</interceptor-ref>
Expand All @@ -150,7 +150,7 @@
</action>

<action name="delete" class="widgetTypeAction" method="delete">
<result type="redirectAction">
<result type="redirectActionXF">
<param name="actionName">viewWidgets</param>
</result>
<interceptor-ref name="entandoDefaultStack">
Expand Down
Loading
Loading