Skip to content

Commit bed350c

Browse files
ottenhoffern
authored andcommitted
SAK-51126 Samigo remove legacy email and related code (#13561)
(cherry picked from commit 8d48b44)
1 parent 9eba11b commit bed350c

File tree

10 files changed

+1
-1093
lines changed

10 files changed

+1
-1093
lines changed

samigo/samigo-app/src/java/org/sakaiproject/jsf/util/SamigoJsfTool.java

-11
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
import org.sakaiproject.tool.assessment.ui.bean.evaluation.StudentScoresBean;
6060
import org.sakaiproject.tool.assessment.ui.bean.evaluation.TotalScoresBean;
6161
import org.sakaiproject.tool.assessment.ui.bean.authz.AuthorizationBean;
62-
import org.sakaiproject.tool.assessment.ui.bean.util.EmailBean;
6362
import org.sakaiproject.tool.assessment.ui.listener.evaluation.StudentScoreListener;
6463
import org.sakaiproject.tool.assessment.ui.listener.evaluation.SubmissionNavListener;
6564

@@ -330,16 +329,6 @@ else if (target.indexOf("/jsf/author/publishedSettings") > -1
330329
bean.setAssessmentAttachment();
331330
toolSession.removeAttribute("SENT_TO_FILEPICKER_HELPER");
332331
}
333-
334-
// case 4: create new mail, then set
335-
// emailBean.attachmentList = filepicker list
336-
else if (target.indexOf("/jsf/evaluation/createNewEmail") > -1
337-
&& ("true").equals(toolSession.getAttribute("SENT_TO_FILEPICKER_HELPER"))) {
338-
EmailBean bean = (EmailBean) ContextUtil.lookupBeanFromExternalServlet("email", req, res);
339-
bean.prepareAttachment();
340-
toolSession.removeAttribute("SENT_TO_FILEPICKER_HELPER");
341-
}
342-
343332
else if (target.indexOf("/jsf/evaluation/questionScore") > -1
344333
&& ("true").equals(toolSession.getAttribute("SENT_TO_FILEPICKER_HELPER"))) {
345334
QuestionScoresBean bean = (QuestionScoresBean) ContextUtil.lookupBeanFromExternalServlet("questionScores", req, res);

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/util/EmailBean.java

-339
This file was deleted.

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/TotalScoreListener.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
import org.sakaiproject.tool.assessment.ui.bean.evaluation.QuestionScoresBean;
7878
import org.sakaiproject.tool.assessment.ui.bean.evaluation.SubmissionStatusBean;
7979
import org.sakaiproject.tool.assessment.ui.bean.evaluation.TotalScoresBean;
80-
import org.sakaiproject.tool.assessment.ui.bean.util.EmailBean;
8180
import org.sakaiproject.tool.assessment.ui.listener.util.ContextUtil;
8281
import org.sakaiproject.tool.assessment.util.BeanSort;
8382
import org.sakaiproject.user.api.User;
@@ -124,7 +123,6 @@ public void processAction(ActionEvent ae) throws
124123
QuestionScoresBean questionbean = (QuestionScoresBean) ContextUtil.lookupBean("questionScores");
125124
HistogramScoresBean histobean = (HistogramScoresBean) ContextUtil.lookupBean("histogramScores");
126125
SubmissionStatusBean submissionbean = (SubmissionStatusBean) ContextUtil.lookupBean("submissionStatus");
127-
EmailBean emailBean = (EmailBean) ContextUtil.lookupBean("email");
128126

129127
// we probably want to change the poster to be consistent
130128
String publishedId = ContextUtil.lookupParam("publishedId");
@@ -166,12 +164,8 @@ public void processAction(ActionEvent ae) throws
166164
sb.append(" ");
167165
sb.append(agent.getLastName());
168166
bean.setGraderName(sb.toString());
169-
emailBean.setFromName(agent.getEmail());
170-
// Set from email here. We need it to decide if the Email link should be displayed or not.
171-
// (if from email is null, we don't display the Email link)
172-
// as well.
167+
// Set grader email info to be used to determine if mailto links should be shown
173168
bean.setGraderEmailInfo(agent.getEmail());
174-
emailBean.setFromEmailAddress(agent.getEmail());
175169

176170
// checking for permission first
177171
FacesContext context = FacesContext.getCurrentInstance();

0 commit comments

Comments
 (0)