Changes for page homeopathsSheet

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

From version 1.60
edited by Jip-jan Alunkel
on March 08, 00:51
Change comment: There is no comment for this version
To version 1.54
edited by Jip-jan Alunkel
on March 07, 23:35
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -7,9 +7,8 @@
7 7  #set($discard = $xwiki.jsx.use('assets.pagemaker.WebHome', {'minify': false, 'language': $context.language, 'myParameter': 'value'}))
8 8  #set($theDoc = $xwiki.getDocument("${doc.fullName}").getTranslatedDocument())
9 9  #set($isInline = $xcontext.action == 'edit' && $request.get('editor') == 'inline')
10 -#set($theClass = "homeopaths.Code.homeopathsClass")
11 11  ## Create object (important for sheet binding, do not remove)
12 -#set($theDocObj = $doc.getObject($theClass, true))
11 +#set($theDocObj = $doc.getObject("homeopaths.Code.homeopathsClass", true))
13 13  #set($hasRight = !$isGuest && ($theDocObj.getProperty('user').value == $context.getUser() || $hasAdmin))
14 14  $theDoc.getContent()
15 15  {{html wiki="true" clean="false"}}
... ... @@ -78,14 +78,62 @@
78 78   #set($children = {})
79 79   #foreach($item in $classProperties.keySet())
80 80   #if($classProperties[$item].parent)
80 +$item
81 81   #set($parentID = $classProperties[$item].parent)
82 - #if(!$children[$parentID])
83 - #set($discard = $children.put("$parentID", {}))
84 - #end
82 + #set($discard = $children.put("$parentID", {}))
85 85   #set($discard = $children["$parentID"].put($item, $classProperties[$item]))
86 86   #end
87 87   #end
88 - #createElementObjects($classProperties)
86 +$children
87 + #foreach($item in $classProperties.keySet())
88 + #set($label = $services.localization.render("homeopaths.classproperty.${item}"))
89 + #if($theDocObj.getProperty($item))
90 + #set($value = $theDocObj.getProperty($item).value)
91 + #if($classProperties[$item].type == "bool")
92 + #set($newElem = {
93 + "id" : "$item",
94 + "type" : "checkbox",
95 + "required" : "false",
96 + "label" : "$label",
97 + "value" : "$value",
98 + "data-opener" : "true"
99 + })
100 + #else
101 +## #if($classProperties[$item].opener)
102 + #set($newElem = {
103 + "id": "$item",
104 + "type": "text",
105 + "required" : "false",
106 + "label" : "$label",
107 + "data-create-xobj" : "true",
108 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass",
109 + "data-xobj-fieldname" : "$item",
110 + "value": "$value"
111 + })
112 + #end
113 + #set($thisObj["$item"] = $newElem)
114 + #end
115 + #end
116 + #set($practiceName = {
117 + "id": "practiceName",
118 + "type": "text",
119 + "required" : "false",
120 + "label" : "Practice name",
121 + "data-create-xobj" : "true",
122 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass",
123 + "data-xobj-fieldname" : "practiceName",
124 + "value": "$doc.getTitle()"
125 + })
126 + #set($city = {
127 + "id": "city",
128 + "type": "text",
129 + "required" : "false",
130 + "label" : "City",
131 + "data-create-xobj" : "true",
132 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass",
133 + "data-xobj-fieldname" : "pmCity",
134 + "value": "$theDocObj.getProperty('pmCity').value"
135 + })
89 89   #set($submit = {
90 90   "id" : "edit_details",
91 91   "button-text" : "Save changes",
... ... @@ -109,8 +109,8 @@
109 109   #foreach($obj in $thisObj)
110 110   #createFormElement($obj)
111 111   #end
112 -## #createFormElement($practiceName)
113 -## #createFormElement($city)
159 + #createFormElement($practiceName)
160 + #createFormElement($city)
114 114   </div>
115 115   <div class="modal-footer">
116 116   <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
... ... @@ -124,35 +124,5 @@
124 124  #else
125 125   This page can not be viewed in inline mode.
126 126  #end
127 -
128 -#macro(createElementObjects $properties)
129 - #foreach($item in $properties.keySet())
130 - #set($label = $services.localization.render("homeopaths.classproperty.${item}"))
131 - #if($theDocObj.getProperty($item))
132 - #set($value = $theDocObj.getProperty($item).value)
133 - #set($newElem = {
134 - "id" : "$item",
135 - "type" : $classProperties[$item].type,
136 - "required" : "false",
137 - "label" : "$label",
138 - "data-create-xobj" : "true",
139 - "data-xobj-classname" : $theClass,
140 - "data-xobj-fieldname" : "$item",
141 - "value" : "$value"
142 - })
143 - #if($classProperties[$item].opener == 1)
144 - #set($discard = $newElem.put("data-opener", "true"))
145 - #end
146 - #if($classProperties[$item].extraAttributes)
147 - #set($attrMap = $classProperties[$item].extraAttributes)
148 - #foreach($attr in $attrMap.keySet())
149 - #set($discard = $newElem.put("$attr", $attrMap[$attr]))
150 - #end
151 - #end
152 - #set($thisObj["$item"] = $newElem)
153 - #end
154 - #end
155 -#end
156 -
157 157  {{/html}}
158 158  {{/velocity}}