Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into fix-1146_page_editor_behaviour

Browse Source
This commit is contained in:
Preet 2022-03-02 12:07:26 +05:30
commit e64bf8f60b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/src/ce/constants/messages.ts
View File

@ -58,7 +58,7 @@ export const LOGIN_PAGE_SIGN_UP_LINK_TEXT = () => `Sign up`;
export const SIGNUP_PAGE_TITLE = () => `Create your free account`;
export const SIGNUP_PAGE_SUBTITLE = () => `Use your organization email`;
export const SIGNUP_PAGE_EMAIL_INPUT_LABEL = () => `Email`;
export const SIGNUP_PAGE_EMAIL_INPUT_PLACEHOLDER = () => ` Email`;
export const SIGNUP_PAGE_EMAIL_INPUT_PLACEHOLDER = () => `Email`;
export const SIGNUP_PAGE_NAME_INPUT_PLACEHOLDER = () => `Name`;
export const SIGNUP_PAGE_NAME_INPUT_LABEL = () => `Name`;
export const SIGNUP_PAGE_PASSWORD_INPUT_LABEL = () => `Password`;

7
app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationFetcherCEImpl.java
View File

@ -236,7 +236,12 @@ public class ApplicationFetcherCEImpl implements ApplicationFetcherCE {
if(newPageDetails.isPresent()) {
NewPage newPage = newPageDetails.get();
defaultPage.setSlug(getPage.apply(newPage).getSlug());
PageDTO pageDTO = getPage.apply(newPage);
if(pageDTO != null) {
defaultPage.setSlug(pageDTO.getSlug());
} else {
log.error("page dto missing for application {} page {}", application.getId(), defaultPage.getId());
}
} else {
log.error("page not found for application id {}, page id {}", application.getId(), defaultPage.getId());
}