Skip to content

SAK-51126 Samigo remove legacy email and related code #13561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 9, 2025
Merged

SAK-51126 Samigo remove legacy email and related code #13561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e94a6e
SAK-51126 Remove legacy SamigoEmailService and related code
ottenhoff Apr 7, 2025
0b35d1a
SAK-51126 Remove EmailListener.java
ottenhoff Apr 7, 2025
eede584
SAK-51126 Remove email-related navigation rules
ottenhoff Apr 7, 2025
97f78d7
Merge branch 'master' into SAK-51126
ottenhoff Apr 7, 2025
dc500ec
remove comment
ottenhoff Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions samigo/samigo-app/src/java/org/sakaiproject/jsf/util/SamigoJsfTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
import org.sakaiproject.tool.assessment.ui.bean.evaluation.StudentScoresBean;
import org.sakaiproject.tool.assessment.ui.bean.evaluation.TotalScoresBean;
import org.sakaiproject.tool.assessment.ui.bean.authz.AuthorizationBean;
import org.sakaiproject.tool.assessment.ui.bean.util.EmailBean;
import org.sakaiproject.tool.assessment.ui.listener.evaluation.StudentScoreListener;
import org.sakaiproject.tool.assessment.ui.listener.evaluation.SubmissionNavListener;

Expand Down Expand Up @@ -330,16 +329,6 @@ else if (target.indexOf("/jsf/author/publishedSettings") > -1
bean.setAssessmentAttachment();
toolSession.removeAttribute("SENT_TO_FILEPICKER_HELPER");
}

// case 4: create new mail, then set
// emailBean.attachmentList = filepicker list
else if (target.indexOf("/jsf/evaluation/createNewEmail") > -1
&& ("true").equals(toolSession.getAttribute("SENT_TO_FILEPICKER_HELPER"))) {
EmailBean bean = (EmailBean) ContextUtil.lookupBeanFromExternalServlet("email", req, res);
bean.prepareAttachment();
toolSession.removeAttribute("SENT_TO_FILEPICKER_HELPER");
}

else if (target.indexOf("/jsf/evaluation/questionScore") > -1
&& ("true").equals(toolSession.getAttribute("SENT_TO_FILEPICKER_HELPER"))) {
QuestionScoresBean bean = (QuestionScoresBean) ContextUtil.lookupBeanFromExternalServlet("questionScores", req, res);
Expand Down
339 changes: 0 additions & 339 deletions samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/util/EmailBean.java
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions .../src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/TotalScoreListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
import org.sakaiproject.tool.assessment.ui.bean.evaluation.QuestionScoresBean;
import org.sakaiproject.tool.assessment.ui.bean.evaluation.SubmissionStatusBean;
import org.sakaiproject.tool.assessment.ui.bean.evaluation.TotalScoresBean;
import org.sakaiproject.tool.assessment.ui.bean.util.EmailBean;
import org.sakaiproject.tool.assessment.ui.listener.util.ContextUtil;
import org.sakaiproject.tool.assessment.util.BeanSort;
import org.sakaiproject.user.api.User;
Expand Down Expand Up @@ -124,7 +123,6 @@ public void processAction(ActionEvent ae) throws
QuestionScoresBean questionbean = (QuestionScoresBean) ContextUtil.lookupBean("questionScores");
HistogramScoresBean histobean = (HistogramScoresBean) ContextUtil.lookupBean("histogramScores");
SubmissionStatusBean submissionbean = (SubmissionStatusBean) ContextUtil.lookupBean("submissionStatus");
EmailBean emailBean = (EmailBean) ContextUtil.lookupBean("email");

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

// checking for permission first
FacesContext context = FacesContext.getCurrentInstance();
Expand Down
Loading
Loading