SAK-40492: Add calendar read events to sitestats (sakaiproject#5899)

chundcm · Aug 23, 2018 · 17d78a4 · 17d78a4
1 parent 5569ad6
commit 17d78a4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/tool/CalendarAction.java b/calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/tool/CalendarAction.java
@@ -2524,7 +2524,7 @@ else if (stateName.equals(STATE_SET_FREQUENCY))
 		        // need to cleanup the cal references which look like /calendar/calendar/4ea74c4d-3f9e-4c32-b03f-15e7915e6051/main
 		        String eventRef = StringUtils.replace(calendarRef, "/main", "/"+stateName);
 		        String calendarEventId = state.getCalendarEventId();
-		        if (StringUtils.isNotBlank(calendarEventId)) {
+		        if (StringUtils.isNotBlank(calendarEventId) && stateName.equals("description")) {
 		            eventRef += "/"+calendarEventId;
 		        }
 		        ets.post(ets.newEvent("calendar.read", eventRef, false));

diff --git a/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef.xml b/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef.xml
@@ -386,7 +386,7 @@
 		selected="true">
 		<event eventId="calendar.new" selected="true"/>
 		<event eventId="calendar.revise" selected="true"/>
-		<!--<event eventId="calendar.read" selected="true"/>-->
+		<event eventId="calendar.read" selected="true"/>
 		<eventParserTip for="contextId" separator="/" index="3"/>
 	</tool>
 

diff --git a/sitestats/sitestats-bundle/src/resources/Events.properties b/sitestats/sitestats-bundle/src/resources/Events.properties
@@ -205,6 +205,7 @@ search.query = Search performed
 # scheduler
 calendar.new=Calendar event new
 calendar.revise=Calendar event revise
+calendar.read=View calendar
 
 # section
 section.student.join=Section student join