Changes for page homeopathsSheet
Last modified by Jip-jan Alunkel on March 26, 17:31
From version 1.34
edited by Jip-jan Alunkel
on March 07, 23:14
on March 07, 23:14
Change comment:
There is no comment for this version
To version 1.30
edited by Jip-jan Alunkel
on March 07, 20:07
on March 07, 20:07
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -31,29 +31,16 @@ 31 31 #if($xcontext.action == "view") 32 32 <div id="${spaceTitle}" class="box sheet_properties"> 33 33 <h2>Details</h2> 34 -#set($classProperties = { 35 - 'practiceName': {'type': 'string', 'opener': 0}, 36 - 'pmStreet': {'type': 'string', 'opener': 0}, 37 - 'pmHousenumber': {'type': 'string', 'opener': 0}, 38 - 'pmPostcode': {'type': 'string', 'opener': 0}, 39 - 'pmCity': {'type': 'string', 'opener': 0}, 40 - 'pmCounty': {'type': 'string', 'opener': 0}, 41 - 'pmState': {'type': 'string', 'opener': 0}, 42 - 'pmCountry': {'type': 'string', 'opener': 0}, 43 - 'certification': {'type': 'bool', 'opener': 1}, 44 - 'certificationFrom': {'type': 'string', 'opener': 0, 'parent': 'certification'} 45 -}) 46 -#foreach($property in $classProperties.keySet()) 47 - #if($theDocObj.getProperty($property)) 34 +#set($classProperties = ['practiceName','pmStreet','pmHousenumber','pmPostcode','pmCity','pmCounty','pmState','pmCountry','certification','certificationFrom']) 35 +#foreach($property in $classProperties) 48 48 <p class="property"> 49 - ## Difference with added housenumber because of the streetaddress layout.50 - ## Difference with added housenumber because of the streetaddress layout.37 + #if($theDocObj.getProperty($property).value != "" && $property != "pmHousenumber") 38 + #if($property == "pmStreet") 51 51 <span class="property-name">$services.localization.render("homeopaths.classproperty.address")</span> <span class="property-value">$doc.display($property) $doc.display("pmHousenumber")</span> 52 - 40 + #else 53 53 <span class="property-name">$services.localization.render("homeopaths.classproperty.${property}")</span> <span class="property-value">$doc.display($property)</span> 54 - #end 55 - </p> 56 56 #end 43 + </p> 57 57 #end 58 58 #end 59 59 ... ... @@ -74,42 +74,24 @@ 74 74 "use_captcha": "false" 75 75 }) 76 76 #set($thisObj = {}) 77 - #set($children = {}) 78 - #foreach($item in $classProperties.entrySet()) 79 - $item.parent 80 - #if($item.parent) 81 - #set($discard = $children[$item.parent].add($item)) 82 - #end 83 - #end 84 -$children 85 - #foreach($item in $classProperties.keySet()) 64 + #foreach($item in $classProperties) 86 86 #set($label = $services.localization.render("homeopaths.classproperty.${item}")) 87 87 #if($theDocObj.getProperty($item)) 88 88 #set($value = $theDocObj.getProperty($item).value) 89 - #if($classProperties[$item].type == "bool") 90 - #set($newElem = { 91 - "id" : "$item", 92 - "type" : "checkbox", 93 - "required" : "false", 94 - "label" : "$label", 95 - "value" : "$value", 96 - "data-opener" : "true" 97 - }) 98 - #else 99 -## #if($classProperties[$item].opener) 100 - #set($newElem = { 101 - "id": "$item", 102 - "type": "text", 103 - "required" : "false", 104 - "label" : "$label", 105 - "data-create-xobj" : "true", 106 - "data-xobj-classname" : "homeopaths.Code.homeopathsClass", 107 - "data-xobj-fieldname" : "$item", 108 - "value": "$value" 109 - }) 110 - #end 111 - #set($thisObj["$item"] = $newElem) 68 + #else 69 + #set($value = "") 112 112 #end 71 + #set($newElem = { 72 + "id": "$item", 73 + "type": "text", 74 + "required" : "false", 75 + "label" : "$label", 76 + "data-create-xobj" : "true", 77 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass", 78 + "data-xobj-fieldname" : "$item", 79 + "value": "$value" 80 + }) 81 + #set($thisObj["$item"] = $newElem) 113 113 #end 114 114 #set($practiceName = { 115 115 "id": "practiceName",