Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31

From version 3.102
edited by Jip-jan Alunkel
on March 10, 20:54
Change comment: Rollback to version 1.38
To version 3.101
edited by Jip-jan Alunkel
on March 10, 20:30
Change comment: Rollback to version 1.38

Summary

Details

Page properties
Content
... ... @@ -105,22 +105,35 @@
105 105   #foreach($propertyName in $classProperties.keySet())
106 106   #set($item = $classProperties["$propertyName"])
107 107   #if(!$item.containsKey("disabled"))
108 - #set($checkBool = ["false","true"])
109 109   #if(!$item.containsKey("classless") && $theDocObj.getProperty($propertyName)) ## 'address' is not a property in the current class
110 110   #set($value = $theDocObj.getProperty($propertyName).value)
111 111   #if($item.type == "checkbox")
112 - #set($item.extraAttributes["data-checked"] = "$checkBool[$value]")
111 + #set($checkBool = ["false","true"])
112 +$checkBool[$value]
113 +#set($item.extraAttributes["data-checked"] = "$checkBool[$value]")
114 + #else
115 +
113 113   #end
114 - #else
115 - #set($value = "")
116 - #if($item.type == "checkbox" && $item.containsKey("extraAttributes") && !$item.extraAttributes.containsKey("data-checked"))
117 - #set($item.extraAttributes["data-checked"] = "$checkBool[0]")
117 + #end
118 + #if($item.type == "checkbox")
119 + #set($value = "1")
120 + #if($item.containsKey("classless"))
121 + #if(!$item.containsKey("checked"))
122 + #set($item["checked"] = '0')
123 + #end
124 + #else
125 + #set($checkboxPropVal = $theDocObj.getProperty($propertyName).value)
126 + #set($item["checked"] = "$checkboxPropVal")
118 118   #end
119 119   #end
129 + #set($propertyChecked = $item.checked)
130 + #set($propertyOpener = $item.opener)
131 + #set($propertyParent = $item.parent)
132 + #set($extraAttributes = $item.extraAttributes)
133 + #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
120 120   #if(!$value)
121 121   #set($value = "")
122 122   #end
123 - #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
124 124   #if($item.containsKey("classless"))
125 125   #set($newElem = {
126 126   "id" : "$propertyName",
... ... @@ -141,15 +141,20 @@
141 141   "value" : "$value"
142 142   })
143 143   #end
144 - #if($item.extraAttributes.keySet().size() > 0)
145 - #foreach($attr in $item.extraAttributes.keySet())
146 - #set($discard = $newElem.put("$attr", $item.extraAttributes[$attr]))
157 + #if($extraAttributes.keySet().size() > 0)
158 + #foreach($attr in $extraAttributes.keySet())
159 + #set($discard = $newElem.put("$attr", $extraAttributes[$attr]))
147 147   #end
148 148   #end
149 - #if($item.opener)
162 + #if($propertyChecked == '1')
163 + #set($discard = $newElem.put("data-checked", "true"))
164 + #else
165 + #set($discard = $newElem.put("data-checked", "false"))
166 + #end
167 + #if($propertyOpener)
150 150   #set($discard = $newElem.put("data-opener", "true"))
151 151   #end
152 - #if($item.parent)
170 + #if($propertyParent)
153 153   #set($lastChild = "$key")
154 154   #elseif($lastChild != "")
155 155   #set($lastChild = "")
... ... @@ -156,7 +156,7 @@
156 156   #createExpandEnd()
157 157   #end
158 158   #createFormElement($newElem)
159 - #if($item.opener)
177 + #if($propertyOpener)
160 160   #createExpandStart($newElem $value)
161 161   #end
162 162   #end