Skip to content
Snippets Groups Projects
Commit ef30074f authored by srosse's avatar srosse
Browse files

OO-1068: point the show all for students to the MyCourses site

parent 6306d588
No related branches found
No related tags found
No related merge requests found
...@@ -157,7 +157,8 @@ public class RepositoryPortletRunController extends AbstractPortletRunController ...@@ -157,7 +157,8 @@ public class RepositoryPortletRunController extends AbstractPortletRunController
} }
return convertedList; return convertedList;
} }
@Override
protected void reloadModel(SortingCriteria sortingCriteria) { protected void reloadModel(SortingCriteria sortingCriteria) {
if (sortingCriteria.getSortingType() == SortingCriteria.AUTO_SORTING) { if (sortingCriteria.getSortingType() == SortingCriteria.AUTO_SORTING) {
List<RepositoryEntryLight> items = getAllEntries(sortingCriteria); List<RepositoryEntryLight> items = getAllEntries(sortingCriteria);
...@@ -168,7 +169,8 @@ public class RepositoryPortletRunController extends AbstractPortletRunController ...@@ -168,7 +169,8 @@ public class RepositoryPortletRunController extends AbstractPortletRunController
reloadModel(getPersistentManuallySortedItems()); reloadModel(getPersistentManuallySortedItems());
} }
} }
@Override
protected void reloadModel(List<PortletEntry<RepositoryEntryLight>> sortedItems) { protected void reloadModel(List<PortletEntry<RepositoryEntryLight>> sortedItems) {
repoEntryListModel = new RepositoryPortletTableDataModel(sortedItems, getLocale()); repoEntryListModel = new RepositoryPortletTableDataModel(sortedItems, getLocale());
tableCtr.setTableDataModel(repoEntryListModel); tableCtr.setTableDataModel(repoEntryListModel);
...@@ -179,10 +181,16 @@ public class RepositoryPortletRunController extends AbstractPortletRunController ...@@ -179,10 +181,16 @@ public class RepositoryPortletRunController extends AbstractPortletRunController
* @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest, * @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest,
* org.olat.core.gui.components.Component, org.olat.core.gui.control.Event) * org.olat.core.gui.components.Component, org.olat.core.gui.control.Event)
*/ */
@Override
public void event(UserRequest ureq, Component source, Event event) { public void event(UserRequest ureq, Component source, Event event) {
if (source == showAllLink){ if (source == showAllLink){
String target = studentView ? "search.mycourses.student" : "search.mycourses.teacher"; String target;
NewControllerFactory.getInstance().launch("[RepositorySite:0][" + target + ":0]", ureq, getWindowControl()); if(studentView) {
target = "[MyCoursesSite:0][My:0]";
} else {
target = "[RepositorySite:0][My:0]";
}
NewControllerFactory.getInstance().launch(target, ureq, getWindowControl());
} }
} }
...@@ -190,6 +198,7 @@ public class RepositoryPortletRunController extends AbstractPortletRunController ...@@ -190,6 +198,7 @@ public class RepositoryPortletRunController extends AbstractPortletRunController
* @see org.olat.core.gui.control.ControllerEventListener#dispatchEvent(org.olat.core.gui.UserRequest, * @see org.olat.core.gui.control.ControllerEventListener#dispatchEvent(org.olat.core.gui.UserRequest,
* org.olat.core.gui.control.Controller, org.olat.core.gui.control.Event) * org.olat.core.gui.control.Controller, org.olat.core.gui.control.Event)
*/ */
@Override
public void event(UserRequest ureq, Controller source, Event event) { public void event(UserRequest ureq, Controller source, Event event) {
super.event(ureq, source, event); super.event(ureq, source, event);
if (source == tableCtr) { if (source == tableCtr) {
...@@ -205,6 +214,7 @@ public class RepositoryPortletRunController extends AbstractPortletRunController ...@@ -205,6 +214,7 @@ public class RepositoryPortletRunController extends AbstractPortletRunController
} }
} }
@Override
public void event(Event event) { public void event(Event event) {
// //
} }
...@@ -254,7 +264,8 @@ public class RepositoryPortletRunController extends AbstractPortletRunController ...@@ -254,7 +264,8 @@ public class RepositoryPortletRunController extends AbstractPortletRunController
* @param sortingCriteria * @param sortingCriteria
* @return a Comparator for the input sortingCriteria * @return a Comparator for the input sortingCriteria
*/ */
protected Comparator<RepositoryEntryLight> getComparator(final SortingCriteria sortingCriteria) { @Override
protected Comparator<RepositoryEntryLight> getComparator(final SortingCriteria sortingCriteria) {
return new Comparator<RepositoryEntryLight>(){ return new Comparator<RepositoryEntryLight>(){
public int compare(final RepositoryEntryLight repoEntry1, final RepositoryEntryLight repoEntry2) { public int compare(final RepositoryEntryLight repoEntry1, final RepositoryEntryLight repoEntry2) {
int comparisonResult = 0; int comparisonResult = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment