Changes for page Calendar Macro

Summary

• Page properties (1 modified, 0 added, 0 removed)
• Objects (1 modified, 1 added, 0 removed)
  • XWiki.WikiMacroClass[0]
  • XWiki.WikiMacroParameterClass[9]

Details

Page properties

Author

...	...	@@ -1,1 +1,1 @@
1		-XWiki.fischer
	1	+XWiki.admin

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -1,5 +1,4 @@
1	1	{{velocity output="false"}}
2		-$services.localization.use('document', 'Calendar.Translations')
3	3	#if('#dateTimePicker_import()' == "#dateTimePicker_import()")
4	4	#set($picker_macro = false)
5	5	## A simple date picker widget.
...	...	@@ -73,6 +73,10 @@
73	73	#if("$!dateFormat" == "")
74	74	#set($dateFormat = "dd.MM.yyyy HH:mm:ss")
75	75	#end
	75	+#set ($eventLimit = $xcontext.macro.params.eventLimit)
	76	+#if (!$eventLimit)
	77	+ #set ($eventLimit = false)
	78	+#end
76	76
77	77	##
78	78	## some hardwired values that you can feel free to customize
...	...	@@ -85,10 +85,36 @@
85	85	#set($left = "prev,next today")
86	86	#set($center = "title")
87	87	#set($right = "agendaDay,agendaWeek,month,plainList")
	91	+## Can create event in the current calendar or in the space or wiki calendar view if at least one calendar is editable for the current user.
	92	+#set ($canCreateEvents = $xwiki.hasAccessLevel('edit', $xcontext.getUser(), $calendarDoc) || ($filter != 'page' && $services.moccacalendar.allEditableCalendars.size() > 0))
	93	+#set ($calendarsFilter = $request.parameterMap['calendarsFiltler'])
	94	+{{/velocity}}
88	88
89		-#set($canCreateEvents = $xwiki.hasAccessLevel("edit", $xcontext.getUser(), $calendarDoc))
90		-
91		-{{/velocity}}{{velocity}}#if($xcontext.action=='view'){{html clean="false" wiki="false"}}
	96	+{{velocity}}
	97	+#if ($xcontext.action == 'view' && $filter != 'page')
	98	+ #set ($statement = "select doc.fullName, calendar.color from Document doc, doc.object(MoccaCalendar.MoccaCalendarClass) calendar where doc.name <> 'MoccaCalendarTemplate'")
	99	+ #set ($results = $services.query.xwql($statement).execute())
	100	+ #if ($results.size() > 1)
	101	+ === $services.localization.render('MoccaCalendar.calendarevent.filterEvents') ===
	102	+ {{html clean="false"}}
	103	+ <form action="" method="get">
	104	+ #foreach ($result in $results)
	105	+ #set ($docFullName = $result[0])
	106	+ #set ($backgroundColor = $result[1])
	107	+ #set ($checked = $calendarsFilter.contains($docFullName))
	108	+ #set ($title = $xwiki.getDocument($docFullName).displayTitle)
	109	+ <div>
	110	+ <input type="checkbox" id="$docFullName" name="calendarsFiltler" value="$docFullName" #if ($checked) checked #end style="accent-color:$backgroundColor"/>
	111	+ <label for="$docFullName">$title</label>
	112	+ </div>
	113	+ #end
	114	+ <input type="submit" class="btn btn-primary" value="$services.localization.render('MoccaCalendar.calendarevent.filterEvents.submit')" />
	115	+ </form>
	116	+ {{/html}}
	117	+ #end
	118	+#end
	119	+#if ($xcontext.action=='view' || $xcontext.action=='export')
	120	+{{html clean="false" wiki="false"}}
92	92	#if($canCreateEvents)
93	93	## create event link
94	94	<div class="calendar-buttons">
...	...	@@ -99,9 +99,12 @@
99	99	## end create event link
100	100	#end
101	101	<div id="calendar${calcounter}"></div>
102		-#if($calcounter==0 && $canCreateEvents)
103		-## show event description form to trigger load of CK Editor resources
104		-<form class="hidden">$xwiki.getDocument('MoccaCalendar.MoccaCalendarEventTemplate').getObject('MoccaCalendar.MoccaCalendarEventClass').display('description','edit')</form>
	131	+#if ($calcounter == 0 && $canCreateEvents)
	132	+ ## Show event description form to trigger load of CK Editor resources.
	133	+ <form class="hidden">
	134	+ #set ($eventObject = $xwiki.getDocument('MoccaCalendar.MoccaCalendarEventTemplate').getObject('MoccaCalendar.MoccaCalendarEventClass'))
	135	+ $eventObject.display('description','edit').replace('{{html clean="false" wiki="false"}}', '').replace('{{/html}}', '')
	136	+ </form>
105	105	#end
106	106	<script type="text/javascript">
107	107	require(['jquery', 'moccacalendar'], function(jQuery) {
...	...	@@ -114,6 +114,7 @@
114	114	outputSyntax: 'plain',
115	115	calendarDoc: "$!escapetool.javascript($calendarDoc)",
116	116	filter: "$!escapetool.javascript($filter)",
	149	+ calendarsFilter: "$!escapetool.javascript($stringtool.join($calendarsFilter, ','))",
117	117	classname: "MoccaCalendar.MoccaCalendarEventClass",
118	118	startfield: "startDate",
119	119	endfield: "endDate",
...	...	@@ -122,6 +122,7 @@
122	122
123	123	// page is now ready, initialize the calendar...
124	124	var calendar = jQuery('#calendar${calcounter}').fullCalendar({
	158	+ eventLimit: $escapetool.javascript($eventLimit),
125	125	events: {
126	126	url : "$!escapetool.javascript($jsonUrl)",
127	127	type: 'GET',
...	...	@@ -203,7 +203,12 @@
203	203	jQuery('#calendar${calcounter}-btn').click( function(e) { calendarHelper.showCreateEvent(); e.preventDefault(); });
204	204	// helper to be used in callback above
205	205	#set($newPageParams = "template=MoccaCalendar.MoccaCalendarEventTemplate&parentFROM=${escapetool.url($calendarDoc)}&form_token=${services.csrf.getToken()}&ocalcaction=create")
206		-#set($randomDocUrl = $xwiki.getURL("randomPage${util.generateRandomString(10)}",'edit',$newPageParams))
	240	+## If the current user is not allowed to edit the current calendar, then create the temporary randomPage in a calendar that can be edited by the current user.
	241	+#set ($randomSpace = 'MoccaCalendar')
	242	+#if ($services.moccacalendar.allEditableCalendars.size() > 0)
	243	+ #set ($randomSpace = $services.model.resolveDocument($services.moccacalendar.allEditableCalendars[0]).lastSpaceReference)
	244	+#end
	245	+#set($randomDocUrl = $xwiki.getURL("${randomSpace}.randomPage${util.generateRandomString(10)}",'edit',$newPageParams))
207	207	#set($updateUrlParams="?xpage=plain&outputSyntax=plain&calendarDoc=${escapetool.url(${calendarDoc})}&")
208	208	var calendarHelper = new XWiki.MoccaCalendar.Helper(calendar, "$!escapetool.javascript($dateFormat)", "$escapetool.javascript($jsonUrl)", "$escapetool.javascript($randomDocUrl)", "$escapetool.javascript("${updateUrl}${updateUrlParams}")", "$escapetool.javascript($newPageNameUrl)", "$escapetool.javascript($dateCheckUrl)","$escapetool.javascript($deleteEventInstanceUrl)","$escapetool.javascript($newPageParams)", "${escapetool.javascript($services.csrf.getToken())}");
209	209	});

XWiki.WikiMacroParameterClass[9]

Parameter default value

...	...	@@ -1,0 +1,1 @@
	1	+false

Parameter description

...	...	@@ -1,0 +1,1 @@
	1	+Sets a limit on daily event display. Extra events appear in a popover. If false (default) shows all events, else (true) restricts them to the day cell’s height.

Parameter mandatory

...	...	@@ -1,0 +1,1 @@
	1	+No

Parameter name

...	...	@@ -1,0 +1,1 @@
	1	+eventLimit