Merge remote-tracking branch 'origin/galite-02GS' : Fix abnormal beha…

…vior of the list button and menu query in the ProductForm [APPS-02GS][PR#644]
kopiLeft · Nov 5, 2024 · 3609a71 · 3609a71
2 parents 1122de7 + 9f34d81
commit 3609a71
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/base/BackgroundThreadHandler.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/base/BackgroundThreadHandler.kt
@@ -139,6 +139,7 @@ object BackgroundThreadHandler {
    * @param command   The command which accesses the UI.
    */
   fun startAndWaitAndPush(lock: Object, currentUI: UI? = null, command: () -> Unit) {
+    Thread.sleep(50)
     accessAndPush(currentUI = currentUI, command = command)
 
     synchronized(lock) {

diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductForm.kt
@@ -41,7 +41,7 @@ class ProductForm : DictionaryForm(title = "Products", locale = Locale.UK) {
 
   val block = page.insertBlock(BlockProduct())
 
-  inner class BlockProduct : Block("Products", 1, 1) {
+  inner class BlockProduct : Block("Products", 1, 100) {
     val u = table(Product, sequence = Sequence("PRODUCTS_SEQ"))
 
     val idPdt = hidden(domain = INT(20)) {
@@ -52,22 +52,30 @@ class ProductForm : DictionaryForm(title = "Products", locale = Locale.UK) {
     val description = mustFill(domain = STRING(50), position = at(1, 1)) {
       label = "Description"
       help = "The product description"
-      columns(u.description)
+      columns(u.description) {
+        priority = 4
+      }
     }
     val price = mustFill(domain = DECIMAL(20, 10), follow(description)) {
       label = "Price"
       help = "The product unit price excluding VAT"
-      columns(u.price)
+      columns(u.price) {
+        priority = 3
+      }
     }
     val category = mustFill(domain = Category, position = at(2, 1)) {
       label = "Category"
       help = "The product category"
-      columns(u.category)
+      columns(u.category) {
+        priority = 2
+      }
     }
     val taxName = mustFill(domain = Tax, position = at(3, 1)) {
       label = "Tax"
       help = "The product tax name"
-      columns(u.taxName)
+      columns(u.taxName) {
+        priority = 1
+      }
     }
     val photo = visit(domain = IMAGE(width = 100, height = 100), position = at(5, 1)) {
       label = "Image"