LPS-34583

shinnlok · May 8, 2013 · fbcc043 · fbcc043
1 parent 00da444
commit fbcc043
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/portlets/calendar-portlet/docroot/edit_calendar.jsp b/portlets/calendar-portlet/docroot/edit_calendar.jsp
@@ -19,7 +19,7 @@
 <%
 String tabs1 = ParamUtil.getString(request, "tabs1", "general");
 
-String redirect = ParamUtil.getString(request, "redirect");
+String backToURL = ParamUtil.getString(request, "backTo");
 
 Calendar calendar = (Calendar)request.getAttribute(WebKeys.CALENDAR);
 
@@ -29,7 +29,7 @@ CalendarResource calendarResource = (CalendarResource)request.getAttribute(WebKe
 <liferay-portlet:renderURL var="portletURL">
 	<portlet:param name="mvcPath" value="/edit_calendar.jsp" />
 	<portlet:param name="tabs1" value="<%= tabs1 %>" />
-	<portlet:param name="redirect" value="<%= redirect %>" />
+	<portlet:param name="backTo" value="<%= backToURL %>" />
 	<portlet:param name="calendarId" value="<%= (calendar != null) ? String.valueOf(calendar.getCalendarId()) : StringPool.BLANK %>" />
 	<portlet:param name="calendarResourceId" value="<%= (calendarResource != null) ? String.valueOf(calendarResource.getCalendarResourceId()) : StringPool.BLANK %>" />
 </liferay-portlet:renderURL>

diff --git a/portlets/calendar-portlet/docroot/edit_calendar_general.jspf b/portlets/calendar-portlet/docroot/edit_calendar_general.jspf
@@ -15,7 +15,7 @@
 --%>
 
 <liferay-ui:header
-	backURL="<%= redirect %>"
+	backURL="<%= backToURL %>"
 	title='<%= (calendar != null) ? calendar.getName(locale) : LanguageUtil.format(pageContext, "add-new-calendar-for-x", calendarResource.getName(locale)) %>'
 />
 
@@ -24,7 +24,7 @@
 <aui:form action="<%= updateCalendarURL %>" method="post" name="fm">
 	<aui:input name="mvcPath" type="hidden" value="/edit_calendar.jsp" />
 	<portlet:param name="tabs1" value="<%= tabs1 %>" />
-	<aui:input name="redirect" type="hidden" value="<%= redirect %>" />
+	<aui:input name="redirect" type="hidden" value="<%= (calendar != null) ? currentURL : backToURL %>" />
 	<aui:input name="calendarId" type="hidden" value="<%= (calendar != null) ? String.valueOf(calendar.getCalendarId()) : StringPool.BLANK %>" />
 	<aui:input name="calendarResourceId" type="hidden" value="<%= (calendarResource != null) ? String.valueOf(calendarResource.getCalendarResourceId()) : StringPool.BLANK %>" />
 
@@ -58,7 +58,7 @@
 		<aui:button-row>
 			<aui:button type="submit" />
 
-			<aui:button href="<%= redirect %>" type="cancel" />
+			<aui:button href="<%= backToURL %>" type="cancel" />
 		</aui:button-row>
 	</aui:fieldset>
 

diff --git a/portlets/calendar-portlet/docroot/edit_calendar_notification_templates.jspf b/portlets/calendar-portlet/docroot/edit_calendar_notification_templates.jspf
@@ -38,6 +38,11 @@ String defaultTemplateBody = NotificationUtil.getDefaultTemplate(notificationTyp
 String notificationTemplateBody = BeanPropertiesUtil.getString(calendarNotificationTemplate, "body", defaultTemplateBody);
 %>
 
+<liferay-ui:header
+	backURL="<%= backToURL %>"
+	title='<%= calendar.getName(locale) %>'
+/>
+
 <liferay-ui:tabs
 	names="invite-email,reminder-email"
 	param="tabs2"
@@ -51,7 +56,7 @@ String notificationTemplateBody = BeanPropertiesUtil.getString(calendarNotificat
 	<aui:input name="calendarNotificationTemplateId" type="hidden" value="<%= calendarNotificationTemplateId %>" />
 	<aui:input name="tabs1" type="hidden" value="<%= tabs1 %>" />
 	<aui:input name="tabs2" type="hidden" value="<%= tabs2 %>" />
-	<aui:input name="redirect" type="hidden" value="<%= redirect %>" />
+	<aui:input name="redirect" type="hidden" value="<%= currentURL %>" />
 	<aui:input name="calendarId" type="hidden" value="<%= String.valueOf(calendar.getCalendarId()) %>" />
 	<aui:input name="calendarResourceId" type="hidden" value="<%= (calendarResource != null) ? String.valueOf(calendarResource.getCalendarResourceId()) : StringPool.BLANK %>" />
 	<aui:input name="notificationType" type="hidden" value="<%= notificationType.getValue() %>" />
@@ -131,7 +136,7 @@ String notificationTemplateBody = BeanPropertiesUtil.getString(calendarNotificat
 	<aui:button-row>
 		<aui:button type="submit" />
 
-		<aui:button href="<%= redirect %>" type="cancel" />
+		<aui:button href="<%= backToURL %>" type="cancel" />
 	</aui:button-row>
 </aui:form>
 

diff --git a/portlets/calendar-portlet/docroot/view_calendar_menus.jspf b/portlets/calendar-portlet/docroot/view_calendar_menus.jspf
@@ -31,7 +31,7 @@
 						if (calendarResourceId) {
 							<portlet:renderURL var="editCalendarURL">
 								<portlet:param name="mvcPath" value="/edit_calendar.jsp" />
-								<portlet:param name="redirect" value="<%= currentURL %>" />
+								<portlet:param name="backTo" value="<%= currentURL %>" />
 								<portlet:param name="calendarResourceId" value="{calendarResourceId}" />
 							</portlet:renderURL>
 
@@ -104,7 +104,7 @@
 
 					<portlet:renderURL var="editCalendarURL">
 						<portlet:param name="mvcPath" value="/edit_calendar.jsp" />
-						<portlet:param name="redirect" value="<%= currentURL %>" />
+						<portlet:param name="backTo" value="<%= currentURL %>" />
 						<portlet:param name="calendarId" value="{calendarId}" />
 					</portlet:renderURL>