Skip to content
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

Fix ModelConfiguration null validation on Advanced Search on 7.3 temp… #117

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix ModelConfiguration null validation on Advanced Search on 7.3 temp… #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
767f884
Fix ModelConfiguration null validation on Advanced Search on 7.3 temp…
AntonLH Apr 21, 2021
44ba129
Use Liferays own Language.properties
AntonLH Apr 22, 2021
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
5 changes: 0 additions & 5 deletions src/main/resources/templates/7.3/Portlet_XXXXWEB_Language.properties.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,4 @@ ${application.model?lower_case}-updated-successfully=The data has been updated.
${application.model?lower_case}-deleted-successfully=The data has been deleted.
</#list>
there-was-an-unexpected-error.-please-refresh-the-current-page=Unexpected error. Please refresh.
permissions=Permissions
view=View
edit=Update
remove=Delete
trash=Move to trash
# </dmsc:sync> #
4 changes: 2 additions & 2 deletions src/main/resources/templates/7.3/Portlet_XXXXWEB_ViewHelper.java.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@ public class ${capFirstModel}ViewHelper {
SimpleDateFormat dateFormat = new SimpleDateFormat(
HtmlUtil.escape(
portletPreferences.getValue(
"dateFormat", ${uncapFirstModel}Configuration.dateFormat())));
"dateFormat", Validator.isNull(${uncapFirstModel}Configuration) ? "yyyy/MM/dd" : ${uncapFirstModel}Configuration.dateFormat())));

Map<String, Object> advSearchKeywordsObj = new HashMap<>();

try {
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/7.3/Portlet_XXXXWEB_admin_edit_actions.jsp.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ String primKey = String.valueOf(${uncapFirstModel}.getPrimaryKey());
<portlet:param name="resourcePrimKey" value="<%= primKey %>" />
</portlet:actionURL>

<liferay-ui:icon iconCssClass="icon-remove" label="<%= true %>" markupView="lexicon" message="remove" url="<%= delete${capFirstModel}URL.toString() %>" />
<liferay-ui:icon iconCssClass="icon-remove" label="<%= true %>" markupView="lexicon" message="delete" url="<%= delete${capFirstModel}URL.toString() %>" />
</c:if>

<c:if test="<%= ${capFirstModel}EntryPermission.contains(permissionChecker, ${uncapFirstModel}, ActionKeys.DELETE) %>">
Expand All @@ -94,6 +94,6 @@ String primKey = String.valueOf(${uncapFirstModel}.getPrimaryKey());
<portlet:param name="resourcePrimKey" value="<%= primKey %>" />
</portlet:actionURL>

<liferay-ui:icon iconCssClass="icon-trash" label="<%= true %>" markupView="lexicon" message="trash" url="<%= moveToTrash${capFirstModel}URL.toString() %>" />
<liferay-ui:icon iconCssClass="icon-trash" label="<%= true %>" markupView="lexicon" message="move-to-recycle-bin" url="<%= moveToTrash${capFirstModel}URL.toString() %>" />
</c:if>
</liferay-ui:icon-menu>
4 changes: 2 additions & 2 deletions src/main/resources/templates/7.3/Portlet_XXXXWEB_edit_actions.jsp.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ String primKey = String.valueOf(${uncapFirstModel}.getPrimaryKey());
<portlet:param name="resourcePrimKey" value="<%= primKey %>" />
</portlet:actionURL>

<liferay-ui:icon iconCssClass="icon-remove" label="<%= true %>" markupView="lexicon" message="remove" url="<%= delete${capFirstModel}URL.toString() %>" />
<liferay-ui:icon iconCssClass="icon-remove" label="<%= true %>" markupView="lexicon" message="delete" url="<%= delete${capFirstModel}URL.toString() %>" />
</c:if>

<c:if test="<%= ${capFirstModel}EntryPermission.contains(permissionChecker, ${uncapFirstModel}, ActionKeys.DELETE) %>">
Expand All @@ -94,6 +94,6 @@ String primKey = String.valueOf(${uncapFirstModel}.getPrimaryKey());
<portlet:param name="resourcePrimKey" value="<%= primKey %>" />
</portlet:actionURL>

<liferay-ui:icon iconCssClass="icon-trash" label="<%= true %>" markupView="lexicon" message="trash" url="<%= moveToTrash${capFirstModel}URL.toString() %>" />
<liferay-ui:icon iconCssClass="icon-trash" label="<%= true %>" markupView="lexicon" message="move-to-recycle-bin" url="<%= moveToTrash${capFirstModel}URL.toString() %>" />
</c:if>
</liferay-ui:icon-menu>