diff --git a/src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdmin.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdmin.java index 1ef7d2c..428347a 100644 --- a/src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdmin.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdmin.java @@ -355,8 +355,8 @@ public class SnapAdmin { DisplayFormat displayFormat = f.getAnnotation(DisplayFormat.class); DisableEditField disableEdit = f.getAnnotation(DisableEditField.class); - - DbField field = new DbField(f.getName(), fieldName, f, fieldType, schema, displayFormat != null ? displayFormat.format() : null, disableEdit != null); + + DbField field = new DbField(f.getName(), fieldName, f, fieldType, schema, displayFormat != null ? displayFormat.format() : null); field.setConnectedType(connectedType); Id[] idAnnotations = f.getAnnotationsByType(Id.class); @@ -366,6 +366,8 @@ public class SnapAdmin { if (field.isPrimaryKey()) field.setNullable(false); + + field.setDisableEditField(disableEdit != null); return field; } diff --git a/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DbField.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DbField.java index 986bb46..e0cde0f 100644 --- a/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DbField.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DbField.java @@ -96,14 +96,13 @@ public class DbField { @JsonIgnore private DbObjectSchema schema; - public DbField(String javaName, String name, Field field, DbFieldType type, DbObjectSchema schema, String format, boolean isDisable) { + public DbField(String javaName, String name, Field field, DbFieldType type, DbObjectSchema schema, String format) { this.javaName = javaName; this.dbName = name; this.schema = schema; this.field = field; this.type = type; this.format = format; - this.disableEditField = isDisable; } public String getJavaName() { diff --git a/src/main/resources/templates/snapadmin/model/create.html b/src/main/resources/templates/snapadmin/model/create.html index 4c5579c..e968f53 100644 --- a/src/main/resources/templates/snapadmin/model/create.html +++ b/src/main/resources/templates/snapadmin/model/create.html @@ -31,7 +31,7 @@