Changeset 3896

Timestamp:

Oct 20, 2010, 11:25:58 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #711. Added rule that if there is only one fieldset in a form the toggling feature should be ignored.

File:

• trunk/client/servlet/src/org/proteios/gui/web/GUIConverter.java (modified) (4 diffs)

trunk/client/servlet/src/org/proteios/gui/web/GUIConverter.java

@@ -1225 +1225 @@
             for (org.proteios.gui.form.Fieldset fs : fieldsets)
             {
-                Tag fieldset = convertFieldset(fs, form);
+                Tag fieldset = convertFieldset(fs, form, fieldsets.size() > 1 ? true : false);
                 form.add(fieldset);
             }
@@ -1242 +1242 @@
     public Tag convert(org.proteios.gui.form.Fieldset fs)
     {
-        return convertFieldset(fs, null);
+        return convertFieldset(fs, null, false);
     }
     
@@ -1248 +1248 @@
     private int nextFieldsetId() { fieldsetId++; return fieldsetId; }
 
-    private Tag convertFieldset(org.proteios.gui.form.Fieldset fs, Form form)
+    private Tag convertFieldset(org.proteios.gui.form.Fieldset fs, Form form, Boolean useToggle)
     {
         Fieldset fieldset;
@@ -1260 +1260 @@
         legend = fieldset.newDiv().setClass("legend");
         title = new Div().addClass("title");
-      legend.setOnClick("toggleFieldset('" + id + "')");    
-    btn = new Div();
-        btn.addClass("toggle");
-    btn.setId(btnId);
-    legend.add(btn);
-    btn.newCData( fs.isOpen() ? "-" : "+");
+      if(useToggle)
+    {
+        legend.setOnClick("toggleFieldset('" + id + "')");    
+      btn = new Div();
+          btn.addClass("toggle");
+      btn.setId(btnId);
+      legend.add(btn);
+      btn.newCData( fs.isOpen() ? "-" : "+");
+    }
 
         if (fs.getTitle()!= null)