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

OO-4667: don't show lectures column if the feature is not enabled

parent 3b04d99c
No related branches found
No related tags found
No related merge requests found
...@@ -135,7 +135,7 @@ public class RepositoryEntryAuthorQueries { ...@@ -135,7 +135,7 @@ public class RepositoryEntryAuthorQueries {
return new RepositoryEntryAuthorViewResults(views, maxResults <= 0); return new RepositoryEntryAuthorViewResults(views, maxResults <= 0);
} }
protected <T> TypedQuery<T> createViewQuery(SearchAuthorRepositoryEntryViewParams params, Class<T> type) { private <T> TypedQuery<T> createViewQuery(SearchAuthorRepositoryEntryViewParams params, Class<T> type) {
IdentityRef identity = params.getIdentity(); IdentityRef identity = params.getIdentity();
List<String> resourceTypes = params.getResourceTypes(); List<String> resourceTypes = params.getResourceTypes();
......
...@@ -93,6 +93,7 @@ import org.olat.core.util.resource.OresHelper; ...@@ -93,6 +93,7 @@ import org.olat.core.util.resource.OresHelper;
import org.olat.course.CorruptedCourseException; import org.olat.course.CorruptedCourseException;
import org.olat.course.CourseModule; import org.olat.course.CourseModule;
import org.olat.login.LoginModule; import org.olat.login.LoginModule;
import org.olat.modules.lecture.LectureModule;
import org.olat.modules.portfolio.PortfolioService; import org.olat.modules.portfolio.PortfolioService;
import org.olat.modules.portfolio.handler.BinderTemplateResource; import org.olat.modules.portfolio.handler.BinderTemplateResource;
import org.olat.modules.quality.QualityDataCollectionLight; import org.olat.modules.quality.QualityDataCollectionLight;
...@@ -182,6 +183,8 @@ public class AuthorListController extends FormBasicController implements Activat ...@@ -182,6 +183,8 @@ public class AuthorListController extends FormBasicController implements Activat
@Autowired @Autowired
private LoginModule loginModule; private LoginModule loginModule;
@Autowired @Autowired
private LectureModule lectureModule;
@Autowired
protected RepositoryModule repositoryModule; protected RepositoryModule repositoryModule;
@Autowired @Autowired
protected RepositoryService repositoryService; protected RepositoryService repositoryService;
...@@ -344,9 +347,11 @@ public class AuthorListController extends FormBasicController implements Activat ...@@ -344,9 +347,11 @@ public class AuthorListController extends FormBasicController implements Activat
true, OrderBy.lastUsage.name())); true, OrderBy.lastUsage.name()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, Cols.references.i18nKey(), Cols.references.ordinal(), columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, Cols.references.i18nKey(), Cols.references.ordinal(),
true, OrderBy.references.name())); true, OrderBy.references.name()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, Cols.lectureInfos.i18nKey(), Cols.lectureInfos.ordinal(),
true, OrderBy.lectureEnabled.name(), FlexiColumnModel.ALIGNMENT_LEFT, new LectureInfosRenderer(getTranslator())));
if(lectureModule.isEnabled()) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, Cols.lectureInfos.i18nKey(), Cols.lectureInfos.ordinal(),
true, OrderBy.lectureEnabled.name(), FlexiColumnModel.ALIGNMENT_LEFT, new LectureInfosRenderer(getTranslator())));
}
if (licenseModule.isEnabled(licenseHandler)) { if (licenseModule.isEnabled(licenseHandler)) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, false, Cols.license.i18nKey(), null, Cols.license.ordinal(), "license", false, null, FlexiColumnModel.ALIGNMENT_LEFT, columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, false, Cols.license.i18nKey(), null, Cols.license.ordinal(), "license", false, null, FlexiColumnModel.ALIGNMENT_LEFT,
new StaticFlexiCellRenderer("license", new LicenseRenderer(getLocale())))); new StaticFlexiCellRenderer("license", new LicenseRenderer(getLocale()))));
......
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