forked from sakaiproject/sakai
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathsam.diff
79 lines (72 loc) · 4.45 KB
/
sam.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java (revision 2680)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java (working copy)
@@ -79,6 +79,8 @@
import org.sakaiproject.tool.assessment.ui.web.session.SessionUtil;
import org.sakaiproject.tool.assessment.util.MimeTypesLocator;
import org.sakaiproject.tool.cover.ToolManager;
+import org.sakaiproject.tool.cover.SessionManager;
+import org.sakaiproject.tool.api.Session;
import org.sakaiproject.event.cover.EventTrackingService;
import org.sakaiproject.event.cover.NotificationService;
@@ -2868,6 +2870,10 @@
}
public String getSelectURL(){
+ Session session = SessionManager.getCurrentSession();
+ String returnUrl = (String)session.getAttribute("LESSONBUILDER_RETURNURL_SAMIGO");
+ if (returnUrl != null)
+ return returnUrl;
StringBuilder url = new StringBuilder(ServerConfigurationService.getString("portalPath"));
url.append("/site/");
PublishedAssessmentService publishedAssessmentService = new PublishedAssessmentService();
Index: samigo-app/src/webapp/jsf/delivery/beginTakingAssessment.jsp
===================================================================
--- samigo-app/src/webapp/jsf/delivery/beginTakingAssessment.jsp (revision 2680)
+++ samigo-app/src/webapp/jsf/delivery/beginTakingAssessment.jsp (working copy)
@@ -165,11 +165,6 @@
<f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.select.SelectActionListener" />
</h:commandButton>
- <h:commandButton accesskey="#{deliveryMessages.a_cancel}" value="#{deliveryMessages.button_cancel}" type="button"
- style="act" onclick="javascript:window.open('#{delivery.portal}/login','_top')"
-onkeypress="javascript:window.open('#{delivery.portal}/login','_top')"
- rendered="#{delivery.actionString=='takeAssessmentViaUrl'}"
- disabled="#{delivery.actionString=='previewAssessment'}"/>
</p>
<!-- DONE BUTTON, FOR PREVIEW ONLY -->
Index: samigo-app/src/webapp/jsf/delivery/anonymousQuitMessage.jsp
===================================================================
--- samigo-app/src/webapp/jsf/delivery/anonymousQuitMessage.jsp (revision 2680)
+++ samigo-app/src/webapp/jsf/delivery/anonymousQuitMessage.jsp (working copy)
@@ -46,8 +46,6 @@
<h:commandButton accesskey="#{deliveryMessages.a_cancel}" value="#{deliveryMessages.button_continue}" type="button"
styleClass="active" onclick="javascript:history.go(-1);" onkeypress="javascript:history.go(-1);" />
- <h:commandButton accesskey="#{deliveryMessages.a_quit}" value="#{deliveryMessages.button_quit}" type="button"
- onclick="javascript:window.open('#{delivery.portal}/login','_top')" onkeypress="javascript:window.open('#{delivery.portal}/login','_top')" />
</p>
</h:form>
</div>
Index: samigo-app/src/webapp/jsf/delivery/assessmentNotAvailable.jsp
===================================================================
--- samigo-app/src/webapp/jsf/delivery/assessmentNotAvailable.jsp (revision 2680)
+++ samigo-app/src/webapp/jsf/delivery/assessmentNotAvailable.jsp (working copy)
@@ -49,8 +49,6 @@
</h:commandButton>
- <h:commandButton accesskey="#{deliveryMessages.a_next}" value="#{deliveryMessages.button_continue}" type="button" rendered="#{delivery.actionString=='takeAssessmentViaUrl'}"
- style="act" onclick="javascript:window.open('#{delivery.portal}/login','_top')" onkeypress="javascript:window.open('#{delivery.portal}/login','_top')" />
</p>
</h:form>
</div>
Index: samigo-app/src/webapp/jsf/delivery/accessDenied.jsp
===================================================================
--- samigo-app/src/webapp/jsf/delivery/accessDenied.jsp (revision 2680)
+++ samigo-app/src/webapp/jsf/delivery/accessDenied.jsp (working copy)
@@ -42,8 +42,6 @@
<h:outputText value="#{deliveryMessages.access_denied_message}" />
</div>
<p class="act">
- <h:commandButton accesskey="#{deliveryMessages.a_login}" value="#{deliveryMessages.button_continue}" type="button"
- styleClass="active" onclick="javascript:window.open('#{delivery.portal}/login','_top')" onkeypress="javascript:window.open('#{delivery.portal}/login','_top')" />
<%--
<h:commandButton accesskey="#{deliveryMessages.a_cancel}" value="#{deliveryMessages.button_ok}" type="submit"
style="act" action="#{delivery.getOutcome}" >