Skip to content

Commit de3f46b

Browse files
committed
Merge remote-tracking branch 'origin/chore/autocommit-12' into chore/autocommit-12
2 parents f9ba9dc + a236d3f commit de3f46b

File tree

4 files changed

+1
-8
lines changed

4 files changed

+1
-8
lines changed

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/LayoutExecutableUpdateDTO.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.appsmith.external.models.RunBehaviourEnum;
44
import com.appsmith.external.views.Views;
5-
import com.fasterxml.jackson.annotation.JsonIgnore;
65
import com.fasterxml.jackson.annotation.JsonView;
76
import lombok.Getter;
87
import lombok.Setter;
@@ -35,7 +34,6 @@ public class LayoutExecutableUpdateDTO {
3534
*
3635
* @return The runBehaviour, or a value derived from executeOnLoad if runBehaviour is null
3736
*/
38-
@JsonIgnore
3937
public RunBehaviourEnum getRunBehaviour() {
4038
if (runBehaviour != null) {
4139
return runBehaviour;

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,12 @@ public class ActionCE_DTO implements Identifiable, Executable {
106106
* Use runBehaviour instead.
107107
*/
108108
@Deprecated
109-
@JsonView({Views.Internal.class, FromRequest.class, Git.class})
109+
@JsonView({Views.Internal.class, FromRequest.class})
110110
Boolean executeOnLoad;
111111

112112
@JsonView({Views.Public.class, FromRequest.class, Git.class})
113113
RunBehaviourEnum runBehaviour;
114114

115-
@JsonView({Views.Public.class, FromRequest.class, Git.class})
116115
public RunBehaviourEnum getRunBehaviour() {
117116
if (runBehaviour != null) {
118117
return runBehaviour;

app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/LayoutExecutableUpdateDTO.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.appsmith.external.models.RunBehaviourEnum;
44
import com.appsmith.external.views.Views;
5-
import com.fasterxml.jackson.annotation.JsonIgnore;
65
import com.fasterxml.jackson.annotation.JsonView;
76
import lombok.Getter;
87
import lombok.Setter;
@@ -35,7 +34,6 @@ public class LayoutExecutableUpdateDTO {
3534
*
3635
* @return The runBehaviour, or a value derived from executeOnLoad if runBehaviour is null
3736
*/
38-
@JsonIgnore
3937
public RunBehaviourEnum getRunBehaviour() {
4038
if (runBehaviour != null) {
4139
return runBehaviour;

app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ActionViewCE_DTO.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.appsmith.external.models.RunBehaviourEnum;
44
import com.appsmith.external.views.Views;
5-
import com.fasterxml.jackson.annotation.JsonIgnore;
65
import com.fasterxml.jackson.annotation.JsonView;
76
import lombok.Getter;
87
import lombok.NoArgsConstructor;
@@ -46,7 +45,6 @@ public class ActionViewCE_DTO {
4645
@JsonView({Views.Public.class})
4746
RunBehaviourEnum runBehaviour;
4847

49-
@JsonIgnore
5048
public RunBehaviourEnum getRunBehaviour() {
5149
if (runBehaviour != null) {
5250
return runBehaviour;

0 commit comments

Comments
 (0)