diff --git a/src/main/java/org/olat/catalog/ui/CatalogController.java b/src/main/java/org/olat/catalog/ui/CatalogController.java index 6ba3953c3710e7b870d6dbc905e130b4bdd2ab9f..a2b14631e6a56d0aee30c4b41e25c1ae42ddcbf7 100644 --- a/src/main/java/org/olat/catalog/ui/CatalogController.java +++ b/src/main/java/org/olat/catalog/ui/CatalogController.java @@ -1167,7 +1167,7 @@ public class CatalogController extends BasicController implements Activateable2 ContextEntry catCe = entries.remove(0); Long catId = catCe.getOLATResourceable().getResourceableId(); - if(catId == null || catId.longValue() == 0) return; + if(catId == null || catId.longValue() == 0l) return;//nothing to do CatalogEntry ce = CatalogManager.getInstance().loadCatalogEntry(catId); switch(ce.getType()) { case CatalogEntry.TYPE_NODE: { diff --git a/src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties index 1e935214c53a5b0d0689cb94cb7361103a31896a..ddc2a6ddff3164779fafa2479b757d4ade696c13 100644 --- a/src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties +++ b/src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties @@ -15,7 +15,7 @@ edit.member.groups=Gruppenmitgliedschaften edit.member.groups.desc=F\u00FCgen Sie den Benutzer den unten aufgef\u00FChrten Gruppen durch Ausw\u00E4hlen der entsprechenden Checkbox(en) hinzu. edit.member.repo.desc=F\u00FCgen Sie den Benutzer dem Kurs hinzu als\: edit.member.title=Mitgliederrechte Kurs "{0}" -error.atleastone=Es muss mindestens ein Besitzer in der Kurs sein. +error.atleastone=$org.olat.group.ui.main\:error.atleastone group.add=Gruppe hinzuf\u00FCgen group.create=Gruppe erstellen group.remove=$org.olat.group.ui.edit\:resource.remove diff --git a/src/main/java/org/olat/course/member/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/member/_i18n/LocalStrings_en.properties index 65e9b244cad6d6b2d58057c1f77f7c9bdd8d3937..ab0bcbd6946b67c95a6aad3998056f773edb0176 100644 --- a/src/main/java/org/olat/course/member/_i18n/LocalStrings_en.properties +++ b/src/main/java/org/olat/course/member/_i18n/LocalStrings_en.properties @@ -14,7 +14,7 @@ edit.member.groups=Group membership edit.member.groups.desc=Add user to the groups below by selecting the appropriate checkboxes. edit.member.repo.desc=Add user to the course as\: edit.member.title=Member right for the course "{0}" -error.atleastone=At least one owner is required in a course. +error.atleastone=$org.olat.group.ui.main\:error.atleastone group.add=Add group group.create=Create group group.remove=$org.olat.group.ui.edit\:resource.remove diff --git a/src/main/java/org/olat/course/member/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/member/_i18n/LocalStrings_fr.properties index cb7f981bdf3397c3d6cbc2170a883c5ad06eca06..017b319cbfbcf89d3dd3a035a964047064d04699 100644 --- a/src/main/java/org/olat/course/member/_i18n/LocalStrings_fr.properties +++ b/src/main/java/org/olat/course/member/_i18n/LocalStrings_fr.properties @@ -9,7 +9,7 @@ dialog.modal.bg.leave.text=Voulez-vous vraiment supprimer cette personne {0} du edit.member=Administrer les membres edit.member.groups=Membre des groupes edit.member.title=Permissions des membres sur le cours "{0}" -error.atleastone=Le cours doit avoir au moins un propri\u00E9taire. +error.atleastone=$org.olat.group.ui.main\:error.atleastone group.add=Ajouter un groupe group.create=Cr\u00E9er un groupe group.remove=$org.olat.group.ui.edit\:resource.remove diff --git a/src/main/java/org/olat/course/member/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/course/member/_i18n/LocalStrings_pl.properties index 5c904a99816c6dae367941b69ae3f9521eed2b9b..fec376254f7db67402b36e0ac09ac2c1be1be468 100644 --- a/src/main/java/org/olat/course/member/_i18n/LocalStrings_pl.properties +++ b/src/main/java/org/olat/course/member/_i18n/LocalStrings_pl.properties @@ -10,7 +10,7 @@ edit.member=Edytuj cz\u0142onka edit.member.groups=Przynale\u017Cno\u015B\u0107 do grup edit.member.repo.desc=Przypisz u\u017Cytkownika do kursu jako\: edit.member.title=Uprawnienia u\u017Cytkownika do kursu "{0}" -error.atleastone=Wymagany jest przynajmniej jeden w\u0142a\u015Bciciel kursu. +error.atleastone=$org.olat.group.ui.main\:error.atleastone group.add=Dodaj grup\u0119 group.create=Utw\u00F3rz grup\u0119 group.remove=$org.olat.group.ui.edit\:resource.remove diff --git a/src/main/java/org/olat/course/member/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/member/_i18n/LocalStrings_pt_BR.properties index 734910e216dc42d9ce9a627384d2592b607fe614..d731f0ff12679d72677fc904037f34c74c62c16d 100644 --- a/src/main/java/org/olat/course/member/_i18n/LocalStrings_pt_BR.properties +++ b/src/main/java/org/olat/course/member/_i18n/LocalStrings_pt_BR.properties @@ -11,7 +11,7 @@ edit.member.groups=Filia\u00E7\u00E3o ao grupo edit.member.groups.desc=Adicionar usu\u00E1rio para os grupos abaixo, selecionando as op\u00E7\u00F5es apropriadas. edit.member.repo.desc=Adicionar usu\u00E1rio ao curso como\: edit.member.title=Direito de membro para o curso "{0}" -error.atleastone=Pelo menos um dono \u00E9 necess\u00E1rio para um curso. +error.atleastone=$org.olat.group.ui.main\:error.atleastone group.add=Adicionar grupo group.create=Criar grupo group.remove=$org.olat.group.ui.edit\:resource.remove diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties index ad900999366c1c202954177e0ed09352b20177ca..338669ba10b0b0cebf51519057e5fc8b05fbbd4c 100644 --- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties +++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties @@ -19,7 +19,7 @@ dialog.modal.bg.remove.text=Wollen Sie wirklich "{0}" aus dieser Gruppe entferne dialog.modal.bg.send.mail=Wollen Sie die betroffene(n) Person(en) per E-mail benachrichtigen? remove.send.mail=Benachrichtigung remove.send.mail.label=E-mail versenden -error.atleastone=$org.olat.course.member\:error.atleastone +error.atleastone=Es muss mindestens ein Besitzer in der Kurs sein. main.menu.title=Gruppen main.menu.title.alt=Gruppen diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties index 60a740574525a4929e1d6d637bb54f481eca21fc..5eab6ed19845a2c0d208b48ca736dc4037f104c8 100644 --- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties +++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties @@ -40,6 +40,7 @@ remove.send.mail.label=Send E-mail edit.member=Edit membership edit.member.groups=Group memberships edit.member.title=Member rights course {0} +error.atleastone=At least one owner is required in a course. email.group=Send E-mail group.access.success=Access to group is successful group.used.in.course=This group is used in the following courses\: diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties index 3b9885614fe775c3c6beb35c8276b875671aaf1c..65922bdf2f8310d6b688fb8d1ba91a06073e9d40 100644 --- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties +++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties @@ -22,7 +22,7 @@ index.header=Groupes index.intro=Dans la liste ci-dessus, vous trouvez tous les groupes de travail, d'\u00E9tude et de droits dont vous faites partie. index.table.nogroup=Vous ne faites partie d'aucun groupe. info.group.deleted=Le groupe de travail a \u00E9t\u00E9 effac\u00E9 - +error.atleastone=Le cours doit avoir au moins un propri\u00E9taire. main.menu.title=Groupes main.menu.title.alt=Groupes diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pl.properties index fafa3b38ca20f7d5b2aad8561c125f254ee28ef9..5f8310dd026b89447acff3942ca97a2f6133e751 100644 --- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pl.properties +++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pl.properties @@ -29,6 +29,7 @@ dialog.modal.bg.mail.text=Czy chcesz poinformowa\u0107 cz\u0142onk\u00F3w grupy edit.member=Edytuj cz\u0142onkostwo edit.member.groups=Cz\u0142onkostwo w grupie edit.member.title=Uprawnienia cz\u0142onk\u00F3w do kursu {0} +error.atleastone=Wymagany jest przynajmniej jeden w\u0142a\u015Bciciel kursu. email.group=Wy\u015Blij e-mail group.access.success=Dost\u0119p do grupy udany group.used.in.course=Ta grupa jest u\u017Cywana w nast\u0119puj\u0105cych kursach\: diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pt_BR.properties index 5522becbb569c6d615f3792257e7c50e61f67523..980fd36b493d1a9c4793efe1f591ea6e505ca5ef 100644 --- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pt_BR.properties +++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pt_BR.properties @@ -22,7 +22,7 @@ index.header=Grupos index.intro=A seguinte lista mostra todos os grupos de projeto, estudo e direitos que voc\u00EA participa. index.table.nogroup=Voc\u00EA n\u00E3o est\u00E1 registrado em nenhum grupo. info.group.deleted=Esse grupo de projeto foi removido. - +error.atleastone=Pelo menos um dono \u00E9 necess\u00E1rio para um curso. main.menu.title=Grupos main.menu.title.alt=Grupos diff --git a/src/main/java/org/olat/resource/accesscontrol/ui/_content/configuration_list.html b/src/main/java/org/olat/resource/accesscontrol/ui/_content/configuration_list.html index 9c3a677b816df703333ca3a3d44a835be82e7d74..d5962f2c5dd7e3ddd67b8c06be51831d25334df1 100644 --- a/src/main/java/org/olat/resource/accesscontrol/ui/_content/configuration_list.html +++ b/src/main/java/org/olat/resource/accesscontrol/ui/_content/configuration_list.html @@ -19,9 +19,12 @@ <td><div class="b_form_element">$r.render("to_$confController.link.key")</div></td> <td>$r.render("del_$confController.link.key")</td> </tr> - <tr class="$css b_access_desc"> - <td colspan="5">$confController.getLink().getOffer().getDescription()</td> - </tr> + #set($desc = $confController.getLink().getOffer().getDescription()) + #if ($desc) + <tr class="$css b_access_desc"> + <td colspan="5">$desc</td> + </tr> + #end #end </tbody> </table>