Änderungen von Dokument Calendar Macro
Zuletzt geändert von xwikiadmin am 2025/01/07 11:32
Von Version 4.1
bearbeitet von xwikiadmin
am 2024/06/24 14:25
am 2024/06/24 14:25
Änderungskommentar:
Install extension [com.xwiki.mocca-calendar:application-mocca-calendar-ui/2.13.3]
Auf Version 1.1
bearbeitet von xwikiadmin
am 2022/08/11 17:50
am 2022/08/11 17:50
Änderungskommentar:
Install extension [com.xwiki.mocca-calendar:application-mocca-calendar-ui/2.11.1]
Zusammenfassung
-
Objekte (1 geändert, 0 hinzugefügt, 1 gelöscht)
Details
- XWiki.WikiMacroClass[0]
-
- Makro-Code
-
... ... @@ -10,13 +10,6 @@ 10 10 #set($calcounter = $request.getAttribute('MoccaCalendar.Code.Macro:counter')) 11 11 #if(!$calcounter) #set($calcounter = 0) #else #set($calcounter = $calcounter + 1) #end 12 12 #set($discard = $request.setAttribute('MoccaCalendar.Code.Macro:counter', $calcounter)) 13 -#set ($wikis = "$!xcontext.macro.params.wikis") 14 -#set ($wikiList = []) 15 -#if ($wikis != '') 16 - #foreach ($wikiId in $wikis.split(',')) 17 - #set ($discard = $wikiList.add($wikiId.trim())) 18 - #end 19 -#end 20 20 #set($filter = $xcontext.macro.params.filter) 21 21 #if(!$filter) 22 22 #set($filter = 'page') ## possible values are wiki, space, page ... ... @@ -126,6 +126,8 @@ 126 126 #end 127 127 {{/velocity}} 128 128 122 +{{include reference="Licenses.Code.VelocityMacros"/}} 123 + 129 129 {{velocity}} 130 130 ## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right 131 131 ## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that ... ... @@ -132,7 +132,7 @@ 132 132 ## don't have view right on those pages. 133 133 #set ($mainReference = $services.model.createDocumentReference('', 'MoccaCalendar', 'MoccaCalendarClass')) 134 134 #if (!$services.licensing.licensor.hasLicensureForEntity($mainReference)) 135 - {{ missingLicenseMessageextensionName="moccacalendar.extension.name"/}}130 + {{error}}#getMissingLicenseMessage('moccacalendar.extension.name'){{/error}} 136 136 #else 137 137 #if($xcontext.action=='view'){{html clean="false" wiki="false"}} 138 138 #if($canCreateEvents) ... ... @@ -146,25 +146,20 @@ 146 146 #end 147 147 <div id="calendar${calcounter}"></div> 148 148 <script type="text/javascript"> 149 -require([' xwiki-meta', 'jquery', 'moccaCalendar'], function(xwikiMeta,jQuery) {144 +require(['jquery', 'moccaCalendar'], function(jQuery) { 150 150 jQuery(document).ready(function() { 151 151 var defaultView = XWiki.MoccaCalendar.Helper.getCalendarView("$!escapetool.javascript($defaultView)"); 152 152 153 - var wikiList = $jsontool.serialize($wikiList); 154 - wikiList = wikiList.map(item => encodeURIComponent(item)); 155 - 156 156 var defaultEventData = { 157 157 xpage: 'plain', 158 158 outputSyntax: 'plain', 159 159 calendarDoc: "$!escapetool.javascript($calendarDoc)", 160 - wikis: wikiList, 161 161 filter: "$!escapetool.javascript($filter)", 162 162 filterDoc: "$!escapetool.javascript($filterDoc)", 163 163 classname: "MoccaCalendar.MoccaCalendarEventClass", 164 164 startfield: "startDate", 165 165 endfield: "endDate", 166 - durationfield: "", 167 - form_token: xwikiMeta.form_token 157 + durationfield: "" 168 168 }; 169 169 170 170 // page is now ready, initialize the calendar... ... ... @@ -181,7 +181,6 @@ 181 181 error: function() { 182 182 calendarHelper.displayError(); 183 183 }, 184 - traditional: true 185 185 }, 186 186 eventClick: function(calEvent, jsEvent, view) { 187 187 new XWiki.MoccaCalendar.MoccaCalendarPopup({editMode: false, event: calEvent}, calendarHelper);
- XWiki.WikiMacroParameterClass[10]
-
- Parameter-Beschreibung
-
... ... @@ -1,1 +1,0 @@ 1 -List of wiki identifiers whose events are shown, separated by a comma. If not specified, events of the current wiki are shown. If specified, the calendarDoc and filter parameters are not taken into account. - Parameter verpflichtend
-
... ... @@ -1,1 +1,0 @@ 1 -Nein - Parameter-Name
-
... ... @@ -1,1 +1,0 @@ 1 -wikis