diff --git a/src/main/java/org/olat/commons/calendar/restapi/EventVO.java b/src/main/java/org/olat/commons/calendar/restapi/EventVO.java
index 3f3786a86edd968f4e6a63f684e3f550162c6d5f..dcff953f347bd2a1c8eb0d011166277732def2ee 100644
--- a/src/main/java/org/olat/commons/calendar/restapi/EventVO.java
+++ b/src/main/java/org/olat/commons/calendar/restapi/EventVO.java
@@ -28,6 +28,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.olat.commons.calendar.CalendarManagedFlag;
import org.olat.commons.calendar.model.KalendarEvent;
+import io.swagger.v3.oas.annotations.media.Schema;
+
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "eventVO")
public class EventVO {
@@ -45,6 +47,16 @@ public class EventVO {
private String liveStreamUrl;
+ @Schema(required = true, description = "Action to be performed on managedFlags", allowableValues = {
+ "all",
+ "details(all)",
+ "subject(details, all)",
+ "description(details, all)",
+ "location(details, all)",
+ "dates(details, all)",
+ "classification(all)",
+ "links(all)",
+ "liveStreamUrl(details, all)"})
private String managedFlags;
private String externalId;
private String externalSource;
diff --git a/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementTypeVO.java b/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementTypeVO.java
index 43833d3afef22563d10018b01dd3e75b495aa445..9e73c82f7eb27ec292f05c34a3a45bce1d271024 100644
--- a/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementTypeVO.java
+++ b/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementTypeVO.java
@@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.olat.modules.curriculum.CurriculumElementType;
import org.olat.modules.curriculum.CurriculumElementTypeManagedFlag;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
*
* Initial date: 16 mai 2018<br>
@@ -42,6 +44,18 @@ public class CurriculumElementTypeVO {
private String description;
private String cssClass;
private String externalId;
+ @Schema(required = true, description = "Action to be performed on managedFlagsString", allowableValues = {
+ "all",
+ "identifier(all)",
+ "displayName(all)",
+ "cssClass(all)",
+ "description(all)",
+ "externalId(all)",
+ "calendars(all)",
+ "lectures(all)",
+ "subTypes(all)",
+ "copy(all)",
+ "delete(all)"})
private String managedFlagsString;
private String calendars;
diff --git a/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementVO.java b/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementVO.java
index 70815f5975ae780649b38078b92a01df207b10d1..78297502a27196d9a6825b423f60844fbd52fcb3 100644
--- a/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementVO.java
+++ b/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementVO.java
@@ -28,6 +28,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.olat.modules.curriculum.CurriculumElement;
import org.olat.modules.curriculum.CurriculumElementManagedFlag;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
*
* Initial date: 15 mai 2018<br>
@@ -48,6 +50,22 @@ public class CurriculumElementVO {
private Date endDate;
private String externalId;
+ @Schema(required = true, description = "Action to be performed on managedFlagsString", allowableValues = {
+ "all",
+ "identifier(all)",
+ "displayName(all)",
+ "description(all)",
+ "externalId(all)",
+ "status(all)",
+ "dates(all)",
+ "type(all)",
+ "calendars(all)",
+ "lectures(all)",
+ "members(all)",
+ "resources(all)",
+ "move(all)",
+ "addChildren(all)",
+ "delete(all)"})
private String managedFlagsString;
private String calendars;
diff --git a/src/main/java/org/olat/modules/curriculum/restapi/CurriculumVO.java b/src/main/java/org/olat/modules/curriculum/restapi/CurriculumVO.java
index 850a86b19c1335c4d1037b2063e266e663c7ba5a..d603f386125f1d81668522cd34d960e8b0154012 100644
--- a/src/main/java/org/olat/modules/curriculum/restapi/CurriculumVO.java
+++ b/src/main/java/org/olat/modules/curriculum/restapi/CurriculumVO.java
@@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumManagedFlag;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
*
* Initial date: 15 mai 2018<br>
@@ -45,6 +47,14 @@ public class CurriculumVO {
private String degree;
private String externalId;
+ @Schema(required = true, description = "Action to be performed on managedFlagsString", allowableValues = {
+ "all",
+ "identifier(all)",
+ "displayName(all)",
+ "description(all)",
+ "externalId(all)",
+ "delete(all)",
+ "members(all)"})
private String managedFlagsString;
private Long organisationKey;
diff --git a/src/main/java/org/olat/modules/lecture/restapi/LectureBlockVO.java b/src/main/java/org/olat/modules/lecture/restapi/LectureBlockVO.java
index 09705be5472069b7f44a74b783f262d09ce518ad..7a45ee764aa2f4d009af3f78e04ea8bcade7e7f3 100644
--- a/src/main/java/org/olat/modules/lecture/restapi/LectureBlockVO.java
+++ b/src/main/java/org/olat/modules/lecture/restapi/LectureBlockVO.java
@@ -28,6 +28,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.olat.modules.lecture.LectureBlock;
import org.olat.modules.lecture.LectureBlockRef;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
*
* Initial date: 8 juin 2017<br>
@@ -40,6 +42,21 @@ public class LectureBlockVO implements LectureBlockRef {
private Long key;
private String externalId;
+
+ @Schema(required = true, description = "Action to be performed on managedFlagsString", allowableValues = {
+ "all",
+ "details(all) //details tab",
+ "title(details,all)",
+ "compulsory(details,all)",
+ "plannedLectures(details,all)",
+ "teachers(details,all)",
+ "groups(details,all)",
+ "description(details,all)",
+ "preparation(details,all)",
+ "location(details,all)",
+ "dates(details,all)",
+ "settings(all)",
+ "delete(all)"})
private String managedFlagsString;
private String title;
diff --git a/src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyLevelTypeVO.java b/src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyLevelTypeVO.java
index 309a19175dd6345bda52cf552ee8dbed5708512c..f0d02cb156edda3906673a056ff10dd897e576c2 100644
--- a/src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyLevelTypeVO.java
+++ b/src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyLevelTypeVO.java
@@ -25,6 +25,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.olat.modules.taxonomy.TaxonomyLevelType;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
*
* Initial date: 5 Oct 2017<br>
@@ -41,6 +43,18 @@ public class TaxonomyLevelTypeVO {
private String description;
private String externalId;
+ @Schema(required = true, description = "Action to be performed on managedFlags", allowableValues = {
+ "all",
+ "identifier(all)",
+ "displayName(all)",
+ "description(all)",
+ "cssClass(all)",
+ "externalId(all)",
+ "visibility(all)",
+ "subTypes(all)",
+ "librarySettings(all)",
+ "copy(all)",
+ "delete(all)"})
private String managedFlags;
private String cssClass;
diff --git a/src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyLevelVO.java b/src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyLevelVO.java
index 5743016d5f74f7f62e1db207f5d75fe057c10cfe..5ce38e319c2662471f17ab17cc7e9cb82cde249d 100644
--- a/src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyLevelVO.java
+++ b/src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyLevelVO.java
@@ -25,6 +25,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.olat.modules.taxonomy.TaxonomyLevel;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
*
* Initial date: 5 Oct 2017<br>
@@ -44,6 +46,21 @@ public class TaxonomyLevelVO {
private Long parentKey;
private Long typeKey;
+ @Schema(required = true, description = "Action to be performed on managedFlags", allowableValues = {
+ "all",
+ "identifier(all)",
+ "displayName(all)",
+ "description(all)",
+ "externalId(all)",
+ "sortOrder(all)",
+ "type(all)",
+ "competences(all)",
+ "manageCompetence(competences, all)",
+ "teachCompetence(competences, all)",
+ "haveCompetence(competences, all)",
+ "targetCompetence(competences, all)",
+ "move(all)",
+ "delete(all)"})
private String managedFlags;
public TaxonomyLevelVO() {
diff --git a/src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyVO.java b/src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyVO.java
index 413cc9de9c4b9fea089cea47a8128d2aa80e1b1a..330d2e82ca85504ee01ff067e9d53d298b7c7c0c 100644
--- a/src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyVO.java
+++ b/src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyVO.java
@@ -25,6 +25,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.olat.modules.taxonomy.Taxonomy;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
*
* Initial date: 5 Oct 2017<br>
@@ -41,6 +43,13 @@ public class TaxonomyVO {
private String description;
private String externalId;
+ @Schema(required = true, description = "Action to be performed on managedFlags", allowableValues = {
+ "all",
+ "identifier(all)",
+ "displayName(all)",
+ "description(all)",
+ "externalId(all)",
+ "librarySettings(all)"})
private String managedFlags;
public TaxonomyVO() {
diff --git a/src/main/java/org/olat/repository/RepositoryEntryManagedFlag.java b/src/main/java/org/olat/repository/RepositoryEntryManagedFlag.java
index 8335710926ba27c30817ab8dc0f1419f9e01d74b..ed8c81b706a588585061f08d0dece9b066490b4b 100644
--- a/src/main/java/org/olat/repository/RepositoryEntryManagedFlag.java
+++ b/src/main/java/org/olat/repository/RepositoryEntryManagedFlag.java
@@ -21,8 +21,8 @@ package org.olat.repository;
import java.util.Arrays;
-import org.olat.core.CoreSpringFactory;
import org.apache.logging.log4j.Logger;
+import org.olat.core.CoreSpringFactory;
import org.olat.core.logging.Tracing;
import org.olat.core.util.StringHelper;
diff --git a/src/main/java/org/olat/restapi/support/vo/CourseVO.java b/src/main/java/org/olat/restapi/support/vo/CourseVO.java
index 4baf6f3f0d68a31eda1462b9805e6ac1effafc04..6e6bcf83d31b763d9b3210ceb81129eb69ffb882 100644
--- a/src/main/java/org/olat/restapi/support/vo/CourseVO.java
+++ b/src/main/java/org/olat/restapi/support/vo/CourseVO.java
@@ -25,6 +25,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
*
* Description:<br>
@@ -50,6 +52,34 @@ public class CourseVO {
private String location;
private String externalId;
private String externalRef;
+ @Schema(required = true, description = "Action to be performed on managedFlags", allowableValues = { "all",
+ "editcontent(all)",
+ "details(all) //details tab",
+ "title(details,all)",
+ "description(details,all)",
+ "objectives(details,all)",
+ "requirements(details,all)",
+ "credits(details,all)",
+ "location(details,all)",
+ "organisations(details,all)",
+ "settings(all) //max num of participants...",
+ "access(settings,all)",
+ "search(settings, all)",
+ "chat(settings,all)",
+ "layout(settings,all)",
+ "resourcefolder(settings,all)",
+ "efficencystatement(settings,all)",
+ "calendar(settings,all)",
+ "glossary(settings,all)",
+ "lecture(all)",
+ "lectureconfig(lecture, all)",
+ "lecturemanagement(lecture, all)",
+ "bookings(all) // change booking rules",
+ "membersmanagement(all)",
+ "groups(all)",
+ "close(all)",
+ "copy(all)",
+ "delete(all)"})
private String managedFlags;
private Long olatResourceKey;
diff --git a/src/main/java/org/olat/restapi/support/vo/GroupVO.java b/src/main/java/org/olat/restapi/support/vo/GroupVO.java
index 5e42c5b8bc2ebcaaa005cdc4d78c4163b997cc85..9394177033564bdde180cc00989c347a1058053c 100644
--- a/src/main/java/org/olat/restapi/support/vo/GroupVO.java
+++ b/src/main/java/org/olat/restapi/support/vo/GroupVO.java
@@ -23,6 +23,9 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
/**
* Initial Date: 7 apr. 2010 <br>
* @author srosse, stephane.rosse@frentix.com
@@ -33,6 +36,19 @@ public class GroupVO {
private Long key;
private String description;
private String externalId;
+ @Schema(required = true, description = "Action to be performed on managedFlags", allowableValues = {
+ "all",
+ "details(all) //details tab",
+ "title(details,all)",
+ "description(details,all)",
+ "settings(details,all) //max num of participants...",
+ "tools(all) //tools tab",
+ "members(all) //members tab",
+ "display(members,all) // members display options",
+ "membersmanagement(members,all)",
+ "resources(all) //add/remove courses",
+ "bookings(all) // change booking rules",
+ "delete(all)"})
private String managedFlags;
private String name;
private String type;
diff --git a/src/main/java/org/olat/restapi/support/vo/RepositoryEntryVO.java b/src/main/java/org/olat/restapi/support/vo/RepositoryEntryVO.java
index 1097de86301917f3297367dee25e37dc3f75be27..9b767043dd87b1973a48656992f9a74d1687510b 100644
--- a/src/main/java/org/olat/restapi/support/vo/RepositoryEntryVO.java
+++ b/src/main/java/org/olat/restapi/support/vo/RepositoryEntryVO.java
@@ -27,6 +27,9 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.olat.repository.RepositoryEntry;
import org.olat.resource.OLATResource;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
/**
* Initial Date: 7 apr. 2010 <br>
* @author srosse, stephane.rosse@frentix.com
@@ -35,6 +38,7 @@ import org.olat.resource.OLATResource;
@XmlRootElement(name = "repositoryEntryVO")
public class RepositoryEntryVO {
+
private Long key;
private String softkey;
private String resourcename;
@@ -46,6 +50,34 @@ public class RepositoryEntryVO {
private String location;
private String externalId;
private String externalRef;
+ @Schema(required = true, description = "Action to be performed on managedFlags", allowableValues = { "all",
+ "editcontent(all)",
+ "details(all) //details tab",
+ "title(details,all)",
+ "description(details,all)",
+ "objectives(details,all)",
+ "requirements(details,all)",
+ "credits(details,all)",
+ "location(details,all)",
+ "organisations(details,all)",
+ "settings(all) //max num of participants...",
+ "access(settings,all)",
+ "search(settings, all)",
+ "chat(settings,all)",
+ "layout(settings,all)",
+ "resourcefolder(settings,all)",
+ "efficencystatement(settings,all)",
+ "calendar(settings,all)",
+ "glossary(settings,all)",
+ "lecture(all)",
+ "lectureconfig(lecture, all)",
+ "lecturemanagement(lecture, all)",
+ "bookings(all) // change booking rules",
+ "membersmanagement(all)",
+ "groups(all)",
+ "close(all)",
+ "copy(all)",
+ "delete(all)"})
private String managedFlags;
private Long resourceableId;
private String resourceableTypeName;
diff --git a/src/main/java/org/olat/user/restapi/IdentityToIdentityRelationVO.java b/src/main/java/org/olat/user/restapi/IdentityToIdentityRelationVO.java
index 27d0db0e48f60158f5facd8f4044b599528be85e..0dc2765163608f5a23378de6deffdc1e97f834e1 100644
--- a/src/main/java/org/olat/user/restapi/IdentityToIdentityRelationVO.java
+++ b/src/main/java/org/olat/user/restapi/IdentityToIdentityRelationVO.java
@@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.olat.basesecurity.IdentityToIdentityRelation;
import org.olat.basesecurity.IdentityToIdentityRelationManagedFlag;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
*
* Initial date: 31 janv. 2019<br>
@@ -41,6 +43,9 @@ public class IdentityToIdentityRelationVO {
private Long identityTargetKey;
private String externalId;
+ @Schema(required = true, description = "Action to be performed on managedFlagsString", allowableValues = {
+ "all",
+ "delete(all)"})
private String managedFlagsString;
private Long relationRoleKey;
diff --git a/src/main/java/org/olat/user/restapi/OrganisationTypeVO.java b/src/main/java/org/olat/user/restapi/OrganisationTypeVO.java
index c9d16c6fb39bc670cd4ccec3fb1ec9bb7b9790fa..06bd1c47afa8be23dafa0d94602e8c449f4f97c6 100644
--- a/src/main/java/org/olat/user/restapi/OrganisationTypeVO.java
+++ b/src/main/java/org/olat/user/restapi/OrganisationTypeVO.java
@@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.olat.basesecurity.OrganisationType;
import org.olat.basesecurity.OrganisationTypeManagedFlag;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
*
* Initial date: 14 mai 2018<br>
@@ -42,6 +44,15 @@ public class OrganisationTypeVO {
private String description;
private String cssClass;
private String externalId;
+ @Schema(required = true, description = "Action to be performed on managedFlagsString", allowableValues = {
+ "all",
+ "identifier(all)",
+ "displayName(all)",
+ "description(all)",
+ "cssClass(all)",
+ "externalId(all)",
+ "subTypes(all)",
+ "delete(all)"})
private String managedFlagsString;
public OrganisationTypeVO() {
diff --git a/src/main/java/org/olat/user/restapi/OrganisationVO.java b/src/main/java/org/olat/user/restapi/OrganisationVO.java
index 96097d12803e7594c36b83df58ae94e1d43e5c30..6f17652f2a690a73d90888b882609967d1d2d1e7 100644
--- a/src/main/java/org/olat/user/restapi/OrganisationVO.java
+++ b/src/main/java/org/olat/user/restapi/OrganisationVO.java
@@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.olat.basesecurity.OrganisationManagedFlag;
import org.olat.core.id.Organisation;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
*
* Initial date: 14 mai 2018<br>
@@ -45,6 +47,16 @@ public class OrganisationVO {
private String status;
private String externalId;
+ @Schema(required = true, description = "Action to be performed on managedFlagsString", allowableValues = {
+ "all",
+ "identifier(all)",
+ "displayName(all)",
+ "description(all)",
+ "externalId(all)",
+ "type(all)",
+ "move(all)",
+ "delete(all)",
+ "members(all)"})
private String managedFlagsString;
private Long rootOrganisationKey;
diff --git a/src/main/java/org/olat/user/restapi/RelationRoleVO.java b/src/main/java/org/olat/user/restapi/RelationRoleVO.java
index 19dafa7c4644fdfe69e6388151ddf84b2b72a305..039db241f9377a986e81000badd491f67941b25e 100644
--- a/src/main/java/org/olat/user/restapi/RelationRoleVO.java
+++ b/src/main/java/org/olat/user/restapi/RelationRoleVO.java
@@ -31,6 +31,8 @@ import org.olat.basesecurity.RelationRole;
import org.olat.basesecurity.RelationRoleManagedFlag;
import org.olat.basesecurity.RelationRoleToRight;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
*
* Initial date: 31 janv. 2019<br>
@@ -45,6 +47,11 @@ public class RelationRoleVO {
private String role;
private String externalId;
private String externalRef;
+ @Schema(required = true, description = "Action to be performed on managedFlags", allowableValues = {
+ "all",
+ "name(all)",
+ "rights(all)",
+ "delete(all)"})
private String managedFlags;
private List<String> rights;
diff --git a/src/test/java/org/olat/selenium/page/course/LTIPage.java b/src/test/java/org/olat/selenium/page/course/LTIPage.java
index beb0e11b3d7df90bc726b87995c5552a3ddd6474..147dbc09dbca08d52efa2b5669df7721efca35dd 100644
--- a/src/test/java/org/olat/selenium/page/course/LTIPage.java
+++ b/src/test/java/org/olat/selenium/page/course/LTIPage.java
@@ -44,6 +44,12 @@ public class LTIPage {
this.browser = browser;
}
+ /**
+ * A successful start will switch the browser to the iframe. If you need
+ * to go back to the LMS, you need to switch back to the default content.
+ *
+ * @return Itself
+ */
public LTIPage start() {
try {
By startBy = By.xpath("//div[contains(@class,'o_button_group')]/a[contains(@onclick,'start')]");
@@ -55,12 +61,10 @@ public class LTIPage {
OOGraphene.waitingALittleLonger();
WebElement iframe = browser.findElement(iframeBy);
- WebDriver iframeBrowser = browser.switchTo().frame(iframe);
+ browser = browser.switchTo().frame(iframe);
By launchedBy = By.xpath("//p[contains(text(),'Launch Validated.')]");
OOGraphene.waitElement(launchedBy, browser);
-
- iframeBrowser.switchTo().defaultContent();
} catch (Exception e) {
OOGraphene.takeScreenshot("LTIPage_start", browser);
throw e;
@@ -96,5 +100,10 @@ public class LTIPage {
Assert.assertTrue(success);
return this;
}
+
+ public LTIPage backToOpenOLAT() {
+ browser = browser.switchTo().defaultContent();
+ return this;
+ }
}