OO-984: if rating is disabled, don't filter by rating, don't retrieve my...

OO-984: if rating is disabled, don't filter by rating, don't retrieve my rating in the my course query

src/main/java/org/olat/repository/manager/RepositoryEntryMyCourseQueries.java

@@ -45,6 +45,7 @@ import org.olat.course.assessment.model.UserEfficiencyStatementImpl;
 import org.olat.course.assessment.model.UserEfficiencyStatementLight;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryMyView;
+import org.olat.repository.RepositoryModule;
 import org.olat.repository.model.RepositoryEntryMyCourseImpl;
 import org.olat.repository.model.SearchMyRepositoryEntryViewParams;
 import org.olat.repository.model.SearchMyRepositoryEntryViewParams.Filter;
@@ -73,6 +74,8 @@ public class RepositoryEntryMyCourseQueries {
 	@Autowired
 	private DB dbInstance;
 	@Autowired
+	private RepositoryModule repositoryModule;
+	@Autowired
 	private EfficiencyStatementManager efficiencyStatementManager;
 	@Autowired
 	private UserCourseInformationsManager userCourseInformationsManager;
@@ -164,12 +167,16 @@ public class RepositoryEntryMyCourseQueries {
 			  .append(" (select count(offer.key) from ").append(OfferImpl.class.getName()).append(" as offer ")
 			  .append("   where offer.resource=res and offer.valid=true")
 			  //TODO validity
-			  .append(" ) as offers, ")
-			  .append(" (select rating.rating from userrating as rating")
-			  .append("   where rating.resId=v.key and rating.creator=ident and rating.resName='RepositoryEntry'")
-			  .append(" ) as myrating")
+			  .append(" ) as offers, ");
+			  if(repositoryModule.isRatingEnabled()) {
+				  sb.append(" (select rating.rating from userrating as rating")
+				  	.append("   where rating.resId=v.key and rating.creator=ident and rating.resName='RepositoryEntry'")
+				  	.append(" ) as myrating");
+			  } else {
+				  sb.append(" 0 as myrating");
+			  }  
 			  // user course informations
-			  .append(" ,(select infos.visit from usercourseinfos as infos")
+			sb.append(" ,(select infos.visit from usercourseinfos as infos")
 			  .append("    where infos.resource=res and infos.identity=ident")
 			  .append(" ) as visit")
 			  //efficiency statements

src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java

@@ -227,7 +227,9 @@ public class RepositoryEntryListController extends FormBasicController
 		sorters.add(new FlexiTableSort(translate("orderby.author"), OrderBy.author.name()));
 		sorters.add(new FlexiTableSort(translate("orderby.creationDate"), OrderBy.creationDate.name()));
 		sorters.add(new FlexiTableSort(translate("orderby.lastModified"), OrderBy.lastModified.name()));
-		sorters.add(new FlexiTableSort(translate("orderby.rating"), OrderBy.rating.name()));
+		if(repositoryModule.isRatingEnabled()) {
+			sorters.add(new FlexiTableSort(translate("orderby.rating"), OrderBy.rating.name()));
+		}
 		
 		FlexiTableSortOptions options = new FlexiTableSortOptions(sorters);
 		options.setDefaultOrderBy(new SortKey(OrderBy.automatic.name(), true));