Merge branch 'bug/72' into 'master'
Fix for dsl getting rewritten See merge request theappsmith/internal-tools-server!56
This commit is contained in:
commit
cdf3c720de
|
|
@ -6,6 +6,7 @@ import com.appsmith.server.domains.Page;
|
||||||
import com.appsmith.server.exceptions.AppsmithError;
|
import com.appsmith.server.exceptions.AppsmithError;
|
||||||
import com.appsmith.server.exceptions.AppsmithException;
|
import com.appsmith.server.exceptions.AppsmithException;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import net.minidev.json.JSONObject;
|
||||||
import org.bson.types.ObjectId;
|
import org.bson.types.ObjectId;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
@ -79,8 +80,10 @@ public class LayoutServiceImpl implements LayoutService {
|
||||||
//Because the findByIdAndLayoutsId call returned non-empty result, we are guaranteed to find the layoutId here.
|
//Because the findByIdAndLayoutsId call returned non-empty result, we are guaranteed to find the layoutId here.
|
||||||
for (Layout storedLayout : layoutList) {
|
for (Layout storedLayout : layoutList) {
|
||||||
if (storedLayout.getId().equals(layoutId)) {
|
if (storedLayout.getId().equals(layoutId)) {
|
||||||
|
JSONObject publishedDsl = storedLayout.getPublishedDsl();
|
||||||
BeanUtils.copyProperties(layout, storedLayout);
|
BeanUtils.copyProperties(layout, storedLayout);
|
||||||
storedLayout.setId(layoutId);
|
storedLayout.setId(layoutId);
|
||||||
|
storedLayout.setPublishedDsl(publishedDsl);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user