Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
ef30074f
Commit
ef30074f
authored
10 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/olat/repository/portlet/RepositoryPortletRunController.java
+16
-5
16 additions, 5 deletions
...at/repository/portlet/RepositoryPortletRunController.java
with
16 additions
and
5 deletions
src/main/java/org/olat/repository/portlet/RepositoryPortletRunController.java
+
16
−
5
View file @
ef30074f
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment