From 50f2844319ff7458bb9d788900bd7964fa0a6e2c Mon Sep 17 00:00:00 2001
From: dalbodeule <11470513+dalbodeule@users.noreply.github.com>
Date: Tue, 20 May 2025 16:28:47 +0900
Subject: [PATCH] Refactor `DbField` to handle `disableEditField` explicitly.

Removed the `isDisable` parameter from the `DbField` constructor and set `disableEditField` through a dedicated method. Updated relevant logic to ensure proper handling of non-editable fields across the application.
---
 .../space/mori/dalbodeule/snapadmin/external/SnapAdmin.java | 6 ++++--
 .../snapadmin/external/dbmapping/fields/DbField.java        | 3 +--
 src/main/resources/templates/snapadmin/model/create.html    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

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 @@
 		        				<form class="form" enctype="multipart/form-data" method="post" th:action="|/${snapadmin_baseUrl}/model/${className}/create|">
 		        					<input type="hidden" name="__snapadmin_create" th:value="${create}">
 									<div th:each="field : ${schema.getSortedFields(false)}" class="mt-2"
-										 th:unless="${(field.isGeneratedValue() && create) || field.isDisableEditField()}"
+										 th:unless="${field.isGeneratedValue() && create || field.isDisableEditField()}"
 										 th:classAppend="|${validationErrors != null && validationErrors.hasErrors(field.getJavaName()) ? 'invalid' : ''}|">
 										<label th:for="|__id_${field.getName()}|" class="mb-1 fw-bold">
 											<span th:if="${!field.isNullable() && !field.isPrimaryKey()}">