diff --git a/.hgtags b/.hgtags
index cd6155330f485b761c000eb5325dadd74f23850d..e1cb21e8dfbd5285c2b8ffa7cc0d1d28b704b623 100644
--- a/.hgtags
+++ b/.hgtags
@@ -130,3 +130,4 @@ cd4752a8e85aed5ac64a2bccfc4e0b8163563265 OpenOLAT 10.4.2
cf5d0249c269c1f9b148726907f6bd13f862c153 OpenOLAT 10.4.3
cf5d0249c269c1f9b148726907f6bd13f862c153 OpenOLAT 10.4.3
1bab889e2565cf0443743da51ad98226e8a6ff8e OpenOLAT 10.4.3
+bc8ce641a5620f5717e9a73e31028d41ab7cdc5d OpenOLAT 10.4.4
diff --git a/src/main/java/org/olat/admin/user/delete/ReadyToDeleteController.java b/src/main/java/org/olat/admin/user/delete/ReadyToDeleteController.java
index c4ebd5b586142bf33ecd40880dc0defabe0657c8..d1520c7ef1ca2bc5d6b1981de5f8434acdc7c9d1 100644
--- a/src/main/java/org/olat/admin/user/delete/ReadyToDeleteController.java
+++ b/src/main/java/org/olat/admin/user/delete/ReadyToDeleteController.java
@@ -148,7 +148,6 @@ public class ReadyToDeleteController extends BasicController {
if (tdm.getObjects(tmse.getSelection()).size() != 0) {
readyToDeleteIdentities = tdm.getObjects(tmse.getSelection());
deleteConfirmController = activateOkCancelDialog(ureq, null, translate("readyToDelete.delete.confirm", getUserlistAsString(readyToDeleteIdentities)), deleteConfirmController);
- return;
} else {
showWarning("nothing.selected.msg");
}
@@ -164,7 +163,7 @@ public class ReadyToDeleteController extends BasicController {
for (Iterator<Identity> iter = readyToDeleteIdentities2.iterator(); iter.hasNext();) {
strb.append((iter.next()).getName());
if (iter.hasNext()) {
- strb.append(",");
+ strb.append(", ");
}
}
return strb.toString();
diff --git a/src/main/java/org/olat/admin/user/delete/SelectionController.java b/src/main/java/org/olat/admin/user/delete/SelectionController.java
index db3d287b1453ec2bda2d8270f04e994a5964bb7a..a1d3f835d3119a9874876175993db3257c1a22c2 100644
--- a/src/main/java/org/olat/admin/user/delete/SelectionController.java
+++ b/src/main/java/org/olat/admin/user/delete/SelectionController.java
@@ -225,8 +225,8 @@ public class SelectionController extends BasicController {
TableGuiConfiguration tableConfig = new TableGuiConfiguration();
tableConfig.setTableEmptyMessage(translate("error.no.user.found"));
- removeAsListenerAndDispose(tableCtr) ;
- tableCtr = new TableController(tableConfig, ureq, getWindowControl(), this.propertyHandlerTranslator);
+ removeAsListenerAndDispose(tableCtr);
+ tableCtr = new TableController(tableConfig, ureq, getWindowControl(), propertyHandlerTranslator);
listenTo(tableCtr);
List<Identity> l = UserDeletionManager.getInstance().getDeletableIdentities(UserDeletionManager.getInstance().getLastLoginDuration());
diff --git a/src/main/java/org/olat/admin/user/delete/_content/deletestatus.html b/src/main/java/org/olat/admin/user/delete/_content/deletestatus.html
index 1323f29923376a0444c657b23c1e151c74fb1ef5..0f95a1da04d6cf7f623aaefdf1f6c3f18af393d5 100644
--- a/src/main/java/org/olat/admin/user/delete/_content/deletestatus.html
+++ b/src/main/java/org/olat/admin/user/delete/_content/deletestatus.html
@@ -1,7 +1,3 @@
-<p>
- $header
-</p>
-<p>
- $r.render("userDeleteStatusPanel")
-</p>
+<p>$header</p>
+<p>$r.render("userDeleteStatusPanel")</p>
\ No newline at end of file
diff --git a/src/main/java/org/olat/admin/user/delete/_content/readyToDelete.html b/src/main/java/org/olat/admin/user/delete/_content/readyToDelete.html
index 89e54bea082fb4d8c0d398b99f0430426cc151d2..269c5ea968d03ff35456edc4b76ff4e6f2bffd77 100644
--- a/src/main/java/org/olat/admin/user/delete/_content/readyToDelete.html
+++ b/src/main/java/org/olat/admin/user/delete/_content/readyToDelete.html
@@ -1,6 +1,2 @@
-<p>
- $header
-</p>
-<p>
- $r.render("readyToDelete")
-</p>
+<p>$header</p>
+<p>$r.render("readyToDelete")</p>
diff --git a/src/main/java/org/olat/admin/user/delete/_content/selectionuserlist.html b/src/main/java/org/olat/admin/user/delete/_content/selectionuserlist.html
index d54af875810ae1c79ee2e8e7d5b11c08327f6de3..ea4e41ab2dd53ec9266d31295683673cdc58278c 100644
--- a/src/main/java/org/olat/admin/user/delete/_content/selectionuserlist.html
+++ b/src/main/java/org/olat/admin/user/delete/_content/selectionuserlist.html
@@ -1,9 +1,3 @@
-<p>
-$header
-</p>
-<p>
- $r.render("button.editParameter")
-</p>
-<p>
- $r.render("userlist")
-</p>
+<p>$header</p>
+<p>$r.render("button.editParameter")</p>
+$r.render("userlist")
\ No newline at end of file
diff --git a/src/main/java/org/olat/admin/user/delete/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/admin/user/delete/_i18n/LocalStrings_en.properties
index 20b5f1194a1b292e72290c8ef436f1a270e377d7..2d56fc94b99cfe71cc0dd9a6d6ca85506130620e 100644
--- a/src/main/java/org/olat/admin/user/delete/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/admin/user/delete/_i18n/LocalStrings_en.properties
@@ -47,4 +47,4 @@ table.col.login=User name
table.identity.deleteEmail=E-mail regarding imminent deletion
table.users.found=Users found
table.users.notfound=The following users could not be found
-user.selection.delete.header=The users below have not logged on to OLAT since {0} months. You can inform them via e-mail about the imminent deletion of their user account. That deletion can be prevented by clicking <i> Activate<i/>.
+user.selection.delete.header=The users below have not logged on to OLAT since {0} months. You can inform them via e-mail about the imminent deletion of their user account. That deletion can be prevented by clicking <i>Activate</i>.
diff --git a/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java b/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java
index 551a7d96a1dcb4e266f70b9c14f6c1a80ec3a797..d072b6862479afcd73b3eac91765df4f4474b154 100644
--- a/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java
+++ b/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java
@@ -346,7 +346,7 @@ public class UserDeletionManager extends BasicManager {
//keep email only -> change login-name
if (!keepUserLoginAfterDeletion){
- identity = securityManager.saveIdentityName(identity, newName);
+ identity = securityManager.saveIdentityName(identity, newName, null);
}
//keep everything, change identity.status to deleted
diff --git a/src/main/java/org/olat/basesecurity/BaseSecurity.java b/src/main/java/org/olat/basesecurity/BaseSecurity.java
index d4c5b8d8fd51b6336ea1ed385c753d5097059487..0df0e788d2642a67be540d3cade0945bc5bdb1be 100644
--- a/src/main/java/org/olat/basesecurity/BaseSecurity.java
+++ b/src/main/java/org/olat/basesecurity/BaseSecurity.java
@@ -629,7 +629,7 @@ public interface BaseSecurity {
* @param newName The new identity name
* @return The reloaded and renamed identity
*/
- public Identity saveIdentityName(Identity identity, String newName);
+ public Identity saveIdentityName(Identity identity, String newName, String newExertnalId);
/**
* Set an external id if the identity is managed by an external system.
diff --git a/src/main/java/org/olat/basesecurity/BaseSecurityManager.java b/src/main/java/org/olat/basesecurity/BaseSecurityManager.java
index a1a4ebdc32e7fbfb906f64aff4232a89e2badb61..a976366d0f464d6f08d102cad2104ecc423b843e 100644
--- a/src/main/java/org/olat/basesecurity/BaseSecurityManager.java
+++ b/src/main/java/org/olat/basesecurity/BaseSecurityManager.java
@@ -1913,9 +1913,10 @@ public class BaseSecurityManager implements BaseSecurity {
}
@Override
- public Identity saveIdentityName(Identity identity, String newName) {
+ public Identity saveIdentityName(Identity identity, String newName, String newExternalId) {
IdentityImpl reloadedIdentity = loadForUpdate(identity);
reloadedIdentity.setName(newName);
+ reloadedIdentity.setExternalId(newExternalId);
reloadedIdentity = dbInstance.getCurrentEntityManager().merge(reloadedIdentity);
dbInstance.commit();
return reloadedIdentity;
diff --git a/src/main/java/org/olat/commons/calendar/ICalServlet.java b/src/main/java/org/olat/commons/calendar/ICalServlet.java
index dc076565c6388d235be4bb9ff5dafc63519861a5..bde343b33759982fd8ba9831737a775418e879bb 100644
--- a/src/main/java/org/olat/commons/calendar/ICalServlet.java
+++ b/src/main/java/org/olat/commons/calendar/ICalServlet.java
@@ -43,6 +43,7 @@ import org.olat.commons.calendar.model.CalendarUserConfiguration;
import org.olat.core.CoreSpringFactory;
import org.olat.core.commons.persistence.DBFactory;
import org.olat.core.id.Identity;
+import org.olat.core.logging.OLATRuntimeException;
import org.olat.core.logging.OLog;
import org.olat.core.logging.Tracing;
import org.olat.core.util.i18n.I18nManager;
@@ -233,17 +234,21 @@ public class ICalServlet extends HttpServlet {
}
private void outputCalendar(CalendarFileInfos fileInfos, Writer out) throws IOException {
- CalendarManager calendarManager = CoreSpringFactory.getImpl(CalendarManager.class);
- Calendar calendar = calendarManager.readCalendar(fileInfos.getCalendarFile());
- updateUrlProperties(calendar);
-
- String prefix = fileInfos.getType() + "-" + fileInfos.getCalendarId() + "-";
- updateUUID(calendar, prefix);
-
- ComponentList events = calendar.getComponents();
- for (final Iterator<?> i = events.iterator(); i.hasNext();) {
- String event = i.next().toString();
- out.write(event);
+ try {
+ CalendarManager calendarManager = CoreSpringFactory.getImpl(CalendarManager.class);
+ Calendar calendar = calendarManager.readCalendar(fileInfos.getCalendarFile());
+ updateUrlProperties(calendar);
+
+ String prefix = fileInfos.getType() + "-" + fileInfos.getCalendarId() + "-";
+ updateUUID(calendar, prefix);
+
+ ComponentList events = calendar.getComponents();
+ for (final Iterator<?> i = events.iterator(); i.hasNext();) {
+ String event = i.next().toString();
+ out.write(event);
+ }
+ } catch (IOException | OLATRuntimeException e) {
+ log.error("", e);
}
}
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java b/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
index cc7d0cba1b2ceb73ca8fdb0f276428d45486dbf0..65eed11c149c7d498c7d76dc0d391e399ec83dd2 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
+++ b/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
@@ -316,6 +316,8 @@ public class BaseFullWebappController extends BasicController implements DTabs,
// init with no bookmark (=empty bc)
mainVc.contextPut("o_bc", "");
+ mainVc.contextPut("o_serverUri", Settings.createServerURI());
+
// the current language; used e.g. by screenreaders
mainVc.contextPut("lang", ureq.getLocale().toString());
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html b/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html
index 00d63ab198428a0d45bbe4def78f929f7ae0be16..eec16fca82492d3fee9fe8fde02955d41afb5606 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html
+++ b/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html
@@ -23,10 +23,10 @@ o_info.o_winid = '$o_winid';
o_info.uriprefix="$r.relWinLink()";
o_info.bc="$o_bc";
o_info.businessPath="";
+o_info.serverUri="$o_serverUri"
o_info.dirty_form = "$r.escapeDoubleQuotes($r.translate("form.dirty"))";
o_info.locale = "$r.getLanguageCode()";
o_info.lastClickTime = new Date().getTime();
-##fxdiff
o_info.drop = true;
## olat layout specific
o_info.o_baseURI = "$r.staticLink("")";
diff --git a/src/main/java/org/olat/core/commons/services/notifications/NotificationsManager.java b/src/main/java/org/olat/core/commons/services/notifications/NotificationsManager.java
index a1513134a8a694d9dced4cc3c00fb4e6d9eeda88..dd08b127cf22b6a1610f87c634082ba36d467d14 100644
--- a/src/main/java/org/olat/core/commons/services/notifications/NotificationsManager.java
+++ b/src/main/java/org/olat/core/commons/services/notifications/NotificationsManager.java
@@ -132,6 +132,14 @@ public abstract class NotificationsManager extends BasicManager {
*/
public abstract Subscriber getSubscriber(Identity identity, Publisher publisher);
+ /**
+ * Delete the subscriber with the specified primary key.
+ *
+ * @param subscriberKey
+ * @return True if something was deleted.
+ */
+ public abstract boolean deleteSubscriber(Long subscriberKey);
+
/**
* Return all subscribers of a publisher
* @param publisher
@@ -306,6 +314,8 @@ public abstract class NotificationsManager extends BasicManager {
* @param publisherData
*/
public abstract void subscribe(Identity identity, SubscriptionContext subscriptionContext, PublisherData publisherData);
+
+ public abstract void subscribe(List<Identity> identities, SubscriptionContext subscriptionContext, PublisherData publisherData);
public abstract void unsubscribe(Subscriber s);
@@ -317,6 +327,13 @@ public abstract class NotificationsManager extends BasicManager {
*/
public abstract void unsubscribe(Identity identity, SubscriptionContext subscriptionContext);
+ /**
+ *
+ * @param identities
+ * @param subscriptionContext
+ */
+ public abstract void unsubscribe(List<Identity> identities, SubscriptionContext subscriptionContext);
+
/**
* @return the handler for the type
*/
diff --git a/src/main/java/org/olat/core/commons/services/notifications/manager/NotificationsManagerImpl.java b/src/main/java/org/olat/core/commons/services/notifications/manager/NotificationsManagerImpl.java
index a20d13e2423afc7298d9bc239a1cfea902501a6a..59fa60da23df690d44d794c2fb2c882640b51a6d 100644
--- a/src/main/java/org/olat/core/commons/services/notifications/manager/NotificationsManagerImpl.java
+++ b/src/main/java/org/olat/core/commons/services/notifications/manager/NotificationsManagerImpl.java
@@ -700,6 +700,7 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us
*
* @param ores
*/
+ @Override
public void deletePublishersOf(OLATResourceable ores) {
String type = ores.getResourceableTypeName();
Long id = ores.getResourceableId();
@@ -726,12 +727,8 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us
*/
@Override
public Subscriber getSubscriber(Identity identity, Publisher publisher) {
- StringBuilder q = new StringBuilder();
- q.append("select sub from notisub as sub ")
- .append(" where sub.publisher.key=:publisherKey and sub.identity.key=:identityKey");
-
List<Subscriber> res = dbInstance.getCurrentEntityManager()
- .createQuery(q.toString(), Subscriber.class)
+ .createNamedQuery("subscribersByPublisherAndIdentity", Subscriber.class)
.setParameter("publisherKey", publisher.getKey())
.setParameter("identityKey", identity.getKey())
.getResultList();
@@ -747,9 +744,8 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us
*/
@Override
public List<Subscriber> getSubscribers(Publisher publisher) {
- String q = "select sub notisub sub where sub.publisher = :publisher";
return dbInstance.getCurrentEntityManager()
- .createQuery(q, Subscriber.class)
+ .createNamedQuery("subscribersByPublisher", Subscriber.class)
.setParameter("publisher", publisher)
.getResultList();
}
@@ -760,9 +756,8 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us
*/
@Override
public List<Identity> getSubscriberIdentities(Publisher publisher) {
- String q = "select sub.identity from notisub sub where sub.publisher = :publisher";
return dbInstance.getCurrentEntityManager()
- .createQuery(q, Identity.class)
+ .createNamedQuery("identitySubscribersByPublisher", Identity.class)
.setParameter("publisher", publisher)
.getResultList();
}
@@ -794,6 +789,15 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us
private void deleteSubscriber(Subscriber subscriber) {
dbInstance.deleteObject(subscriber);
}
+
+ public boolean deleteSubscriber(Long subscriberKey) {
+ String sb = "delete from notisub sub where sub.key=:subscriberKey";
+ int rows = dbInstance.getCurrentEntityManager()
+ .createQuery(sb)
+ .setParameter("subscriberKey", subscriberKey)
+ .executeUpdate();
+ return rows > 0;
+ }
/**
* sets the latest visited date of the subscription to 'now' .assumes the
@@ -845,6 +849,31 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us
}
dbInstance.commit();
}
+
+ @Override
+ public void subscribe(List<Identity> identities, SubscriptionContext subscriptionContext,
+ PublisherData publisherData) {
+ if(identities == null || identities.isEmpty()) return;
+
+ Publisher toUpdate = getPublisherForUpdate(subscriptionContext);
+ if(toUpdate == null) {
+ //create the publisher
+ findOrCreatePublisher(subscriptionContext, publisherData);
+ //lock the publisher
+ toUpdate = getPublisherForUpdate(subscriptionContext);
+ }
+
+ for(Identity identity:identities) {
+ Subscriber s = getSubscriber(identity, toUpdate);
+ if (s == null) {
+ // no subscriber -> create.
+ // s.latestReadDate >= p.latestNewsDate == no news for subscriber when no
+ // news after subscription time
+ doCreateAndPersistSubscriber(toUpdate, identity);
+ }
+ }
+ dbInstance.commit();
+ }
/**
* call this method to indicate that there is news for the given
@@ -895,6 +924,7 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us
/**
* @see org.olat.core.commons.services.notifications.NotificationsManager#registerAsListener(org.olat.core.util.event.GenericEventListener, org.olat.core.id.Identity)
*/
+ @Override
public void registerAsListener(GenericEventListener gel, Identity ident) {
CoordinatorManager.getInstance().getCoordinator().getEventBus().registerFor(gel, ident, oresMyself);
}
@@ -902,6 +932,7 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us
/**
* @see org.olat.core.commons.services.notifications.NotificationsManager#deregisterAsListener(org.olat.core.util.event.GenericEventListener)
*/
+ @Override
public void deregisterAsListener(GenericEventListener gel) {
CoordinatorManager.getInstance().getCoordinator().getEventBus().deregisterFor(gel, oresMyself);
}
@@ -910,11 +941,9 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us
* @param identity
* @param subscriptionContext
*/
+ @Override
public void unsubscribe(Identity identity, SubscriptionContext subscriptionContext) {
- // no need to sync, since an identity only has one gui thread / one mouse
Publisher p = getPublisherForUpdate(subscriptionContext);
- // if no publisher yet.
- //TODO: check race condition: can p be null at all?
if (p != null) {
Subscriber s = getSubscriber(identity, p);
if (s != null) {
@@ -925,6 +954,24 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us
}
dbInstance.commit();
}
+
+ @Override
+ public void unsubscribe(List<Identity> identities, SubscriptionContext subscriptionContext) {
+ if(identities == null || identities.isEmpty()) return;
+
+ Publisher p = getPublisherForUpdate(subscriptionContext);
+ if (p != null) {
+ for(Identity identity:identities) {
+ Subscriber s = getSubscriber(identity, p);
+ if (s != null) {
+ deleteSubscriber(s);
+ } else {
+ logWarn("could not unsubscribe " + identity.getName() + " from publisher:" + p.getResName() + "," + p.getResId() + "," + p.getSubidentifier(), null);
+ }
+ }
+ }
+ dbInstance.commit();
+ }
/**
*
@@ -979,6 +1026,7 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us
*
* @param scontext the subscriptioncontext
*/
+ @Override
public void delete(SubscriptionContext scontext) {
Publisher p = getPublisher(scontext);
// if none found, no one has subscribed yet and therefore no publisher has
diff --git a/src/main/java/org/olat/core/commons/services/notifications/model/SubscriberImpl.java b/src/main/java/org/olat/core/commons/services/notifications/model/SubscriberImpl.java
index 8daaff9a2499637c8fc6263d3e473381b02d5e99..233402c94d3a267267539a8770be637f7019e264 100644
--- a/src/main/java/org/olat/core/commons/services/notifications/model/SubscriberImpl.java
+++ b/src/main/java/org/olat/core/commons/services/notifications/model/SubscriberImpl.java
@@ -34,6 +34,8 @@ import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@@ -57,6 +59,11 @@ import org.olat.core.id.Persistable;
*/
@Entity(name="notisub")
@Table(name="o_noti_sub")
+@NamedQueries({
+ @NamedQuery(name="subscribersByPublisher", query="select sub from notisub sub where sub.publisher=:publisher"),
+ @NamedQuery(name="subscribersByPublisherAndIdentity", query="select sub from notisub as sub where sub.publisher.key=:publisherKey and sub.identity.key=:identityKey"),
+ @NamedQuery(name="identitySubscribersByPublisher", query="select sub.identity from notisub sub where sub.publisher=:publisher")
+})
public class SubscriberImpl implements Subscriber, CreateInfo, Persistable {
private static final long serialVersionUID = 6165097156137862263L;
diff --git a/src/main/java/org/olat/core/commons/services/notifications/restapi/NotificationsWebService.java b/src/main/java/org/olat/core/commons/services/notifications/restapi/NotificationsWebService.java
index 09cc331eb8d87e3faa4db73cd9e401f2fd1ddcc3..9df1fb79ce329d53af4e518a623d55b8706b2cc9 100644
--- a/src/main/java/org/olat/core/commons/services/notifications/restapi/NotificationsWebService.java
+++ b/src/main/java/org/olat/core/commons/services/notifications/restapi/NotificationsWebService.java
@@ -20,6 +20,8 @@
package org.olat.core.commons.services.notifications.restapi;
+import static org.olat.restapi.security.RestSecurityHelper.isAdmin;
+
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -31,20 +33,31 @@ import java.util.Locale;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import org.olat.basesecurity.BaseSecurity;
+import org.olat.core.CoreSpringFactory;
import org.olat.core.commons.services.notifications.NotificationHelper;
import org.olat.core.commons.services.notifications.NotificationsManager;
import org.olat.core.commons.services.notifications.Publisher;
+import org.olat.core.commons.services.notifications.PublisherData;
import org.olat.core.commons.services.notifications.Subscriber;
+import org.olat.core.commons.services.notifications.SubscriptionContext;
import org.olat.core.commons.services.notifications.SubscriptionInfo;
import org.olat.core.commons.services.notifications.model.SubscriptionListItem;
+import org.olat.core.commons.services.notifications.restapi.vo.PublisherVO;
+import org.olat.core.commons.services.notifications.restapi.vo.SubscriberVO;
import org.olat.core.commons.services.notifications.restapi.vo.SubscriptionInfoVO;
import org.olat.core.commons.services.notifications.restapi.vo.SubscriptionListItemVO;
import org.olat.core.id.Identity;
@@ -52,6 +65,7 @@ import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.id.context.ContextEntry;
import org.olat.core.util.StringHelper;
import org.olat.restapi.security.RestSecurityHelper;
+import org.olat.user.restapi.UserVO;
/**
*
@@ -64,6 +78,80 @@ import org.olat.restapi.security.RestSecurityHelper;
@Path("notifications")
public class NotificationsWebService {
+ @GET
+ @Path("subscribers/{ressourceName}/{ressourceId}/{subIdentifier}")
+ @Produces({MediaType.APPLICATION_XML ,MediaType.APPLICATION_JSON})
+ public Response getSubscriber(@PathParam("ressourceName") String ressourceName, @PathParam("ressourceId") Long ressourceId,
+ @PathParam("subIdentifier") String subIdentifier, @Context HttpServletRequest request) {
+ if(!isAdmin(request)) {
+ return Response.serverError().status(Status.UNAUTHORIZED).build();
+ }
+
+ NotificationsManager notificationsMgr = NotificationsManager.getInstance();
+
+ SubscriptionContext subsContext
+ = new SubscriptionContext(ressourceName, ressourceId, subIdentifier);
+
+ Publisher publisher = notificationsMgr.getPublisher(subsContext);
+ if(publisher == null) {
+ return Response.ok().status(Status.NO_CONTENT).build();
+ }
+
+ List<Subscriber> subscribers = notificationsMgr.getSubscribers(publisher);
+ SubscriberVO[] subscriberVoes = new SubscriberVO[subscribers.size()];
+ int count = 0;
+ for(Subscriber subscriber:subscribers) {
+ SubscriberVO subscriberVO = new SubscriberVO();
+ subscriberVO.setPublisherKey(publisher.getKey());
+ subscriberVO.setSubscriberKey(subscriber.getKey());
+ subscriberVO.setIdentityKey(subscriber.getIdentity().getKey());
+ subscriberVoes[count++] = subscriberVO;
+ }
+ return Response.ok(subscriberVoes).build();
+ }
+
+
+ @PUT
+ @Path("subscribers")
+ @Consumes({MediaType.APPLICATION_XML ,MediaType.APPLICATION_JSON})
+ public Response subscribe(PublisherVO publisherVO, @Context HttpServletRequest request) {
+ if(!isAdmin(request)) {
+ return Response.serverError().status(Status.NOT_FOUND).build();
+ }
+
+ NotificationsManager notificationsMgr = NotificationsManager.getInstance();
+ BaseSecurity securityManager = CoreSpringFactory.getImpl(BaseSecurity.class);
+
+ SubscriptionContext subscriptionContext
+ = new SubscriptionContext(publisherVO.getResName(), publisherVO.getResId(), publisherVO.getSubidentifier());
+ PublisherData publisherData
+ = new PublisherData(publisherVO.getType(), publisherVO.getData(), publisherVO.getBusinessPath());
+
+ List<UserVO> userVoes = publisherVO.getUsers();
+ List<Long> identityKeys = new ArrayList<>();
+ for(UserVO userVo:userVoes) {
+ identityKeys.add(userVo.getKey());
+ }
+ List<Identity> identities = securityManager.loadIdentityByKeys(identityKeys);
+ notificationsMgr.subscribe(identities, subscriptionContext, publisherData);
+ return Response.ok().build();
+ }
+
+ @DELETE
+ @Path("subscribers/{subscriberKey}")
+ @Consumes({MediaType.APPLICATION_XML ,MediaType.APPLICATION_JSON})
+ public Response unsubscribe(@PathParam("subscriberKey") Long subscriberKey, @Context HttpServletRequest request) {
+ if(!isAdmin(request)) {
+ return Response.serverError().status(Status.NOT_FOUND).build();
+ }
+
+ NotificationsManager notificationsMgr = NotificationsManager.getInstance();
+ if(notificationsMgr.deleteSubscriber(subscriberKey)) {
+ return Response.ok().build();
+ }
+ return Response.ok().status(Status.NOT_MODIFIED).build();
+ }
+
/**
* Retrieves the notification of the logged in user.
* @response.representation.200.mediaType application/xml, application/json
diff --git a/src/main/java/org/olat/core/commons/services/notifications/restapi/vo/PublisherVO.java b/src/main/java/org/olat/core/commons/services/notifications/restapi/vo/PublisherVO.java
new file mode 100644
index 0000000000000000000000000000000000000000..03fdc3de90eac253e6f4a31a31d4fc11ef3b2add
--- /dev/null
+++ b/src/main/java/org/olat/core/commons/services/notifications/restapi/vo/PublisherVO.java
@@ -0,0 +1,113 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.core.commons.services.notifications.restapi.vo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.olat.user.restapi.UserVO;
+
+/**
+ *
+ * Initial date: 20.01.2016<br>
+ * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "subscribersVO")
+public class PublisherVO {
+
+ //publisher data
+ private String type;
+ private String data;
+ private String businessPath;
+
+ //subscription context
+ private String resName;
+ private Long resId;
+ private String subidentifier;
+ //list of users to subscribe
+ @XmlElementWrapper(name="users")
+ @XmlElement(name="user")
+ private List<UserVO> users = new ArrayList<>();
+
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getData() {
+ return data;
+ }
+
+ public void setData(String data) {
+ this.data = data;
+ }
+
+ public String getBusinessPath() {
+ return businessPath;
+ }
+
+ public void setBusinessPath(String businessPath) {
+ this.businessPath = businessPath;
+ }
+
+ public String getResName() {
+ return resName;
+ }
+
+ public void setResName(String resName) {
+ this.resName = resName;
+ }
+
+ public Long getResId() {
+ return resId;
+ }
+
+ public void setResId(Long resId) {
+ this.resId = resId;
+ }
+
+ public String getSubidentifier() {
+ return subidentifier;
+ }
+
+ public void setSubidentifier(String subidentifier) {
+ this.subidentifier = subidentifier;
+ }
+
+ public List<UserVO> getUsers() {
+ return users;
+ }
+
+ public void setUsers(List<UserVO> users) {
+ this.users = users;
+ }
+}
diff --git a/src/main/java/org/olat/core/commons/services/notifications/restapi/vo/SubscriberVO.java b/src/main/java/org/olat/core/commons/services/notifications/restapi/vo/SubscriberVO.java
new file mode 100644
index 0000000000000000000000000000000000000000..89b6393c1d413a74ebbeab6486984cabf6606e7b
--- /dev/null
+++ b/src/main/java/org/olat/core/commons/services/notifications/restapi/vo/SubscriberVO.java
@@ -0,0 +1,63 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.core.commons.services.notifications.restapi.vo;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ *
+ * Initial date: 19.01.2016<br>
+ * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "subscriberVO")
+public class SubscriberVO {
+
+ private Long subscriberKey;
+ private Long publisherKey;
+ private Long identityKey;
+
+ public Long getSubscriberKey() {
+ return subscriberKey;
+ }
+
+ public void setSubscriberKey(Long subscriberKey) {
+ this.subscriberKey = subscriberKey;
+ }
+
+ public Long getPublisherKey() {
+ return publisherKey;
+ }
+
+ public void setPublisherKey(Long publisherKey) {
+ this.publisherKey = publisherKey;
+ }
+
+ public Long getIdentityKey() {
+ return identityKey;
+ }
+
+ public void setIdentityKey(Long identityKey) {
+ this.identityKey = identityKey;
+ }
+}
diff --git a/src/main/java/org/olat/core/commons/services/webdav/WebDAVModule.java b/src/main/java/org/olat/core/commons/services/webdav/WebDAVModule.java
index c956aab9e4073d05ed98a6417c6c17e16b4ea841..7779416fe5a7f8a182109c20b9f9a5dbe0bc3152 100644
--- a/src/main/java/org/olat/core/commons/services/webdav/WebDAVModule.java
+++ b/src/main/java/org/olat/core/commons/services/webdav/WebDAVModule.java
@@ -47,6 +47,7 @@ public class WebDAVModule extends AbstractSpringModule implements ConfigOnOff {
private static final String TERMS_FOLDERS_ENABLED = "webdav.termsfolders.enabled";
private static final String LEARNERS_BOOKMARKS_COURSE = "webdav.learners.bookmarks.courses";
private static final String LEARNERS_PARTICIPATING_COURSES = "webdav.learners.participating.courses";
+ private static final String PREPEND_COURSE_REFERENCE_TO_TITLE = "webdav.prepend.course.reference.to.title";
@Autowired
private List<WebDAVProvider> webdavProviders;
@@ -59,6 +60,8 @@ public class WebDAVModule extends AbstractSpringModule implements ConfigOnOff {
private boolean digestAuthenticationEnabled;
@Value("${webdav.termsfolders.enabled:true}")
private boolean termsFoldersEnabled;
+ @Value("${webdav.prepend.course.reference.to.title:false}")
+ private boolean prependCourseReferenceToTitle;
@Value("${webdav.learners.bookmarks.enabled:true}")
private boolean enableLearnersBookmarksCourse;
@@ -101,6 +104,10 @@ public class WebDAVModule extends AbstractSpringModule implements ConfigOnOff {
if(StringHelper.containsNonWhitespace(learnersParticipatingCoursesObj)) {
enableLearnersParticipatingCourses = "true".equals(learnersParticipatingCoursesObj);
}
+ String prependCourseReferenceToTitleObj = getStringPropertyValue(PREPEND_COURSE_REFERENCE_TO_TITLE, true);
+ if(StringHelper.containsNonWhitespace(prependCourseReferenceToTitleObj)) {
+ prependCourseReferenceToTitle = "true".equals(prependCourseReferenceToTitleObj);
+ }
}
@Override
@@ -166,6 +173,15 @@ public class WebDAVModule extends AbstractSpringModule implements ConfigOnOff {
this.enableLearnersParticipatingCourses = enabled;
setStringProperty(LEARNERS_PARTICIPATING_COURSES, enabled ? "true" : "false", true);
}
+
+ public boolean isPrependCourseReferenceToTitle() {
+ return prependCourseReferenceToTitle;
+ }
+
+ public void setPrependCourseReferenceToTitle(boolean enabled) {
+ this.prependCourseReferenceToTitle = enabled;
+ setStringProperty(PREPEND_COURSE_REFERENCE_TO_TITLE, enabled ? "true" : "false", true);
+ }
/**
* Return an unmodifiable map
diff --git a/src/main/java/org/olat/core/commons/services/webdav/ui/WebDAVAdminController.java b/src/main/java/org/olat/core/commons/services/webdav/ui/WebDAVAdminController.java
index 001e7e99a7c0d61f8a90fbb29a2ddf6b2bd7c21f..f531c4d0fc43cd26a39536be6142d8549254923b 100644
--- a/src/main/java/org/olat/core/commons/services/webdav/ui/WebDAVAdminController.java
+++ b/src/main/java/org/olat/core/commons/services/webdav/ui/WebDAVAdminController.java
@@ -38,7 +38,7 @@ import org.olat.core.gui.control.WindowControl;
public class WebDAVAdminController extends FormBasicController {
private MultipleSelectionElement enableModuleEl, enableLinkEl, enableDigestEl, enableTermsFoldersEl,
- learnersAsParticipantEl, learnersBookmarkEl;
+ learnersAsParticipantEl, learnersBookmarkEl, prependReferenceEl;
private final WebDAVModule webDAVModule;
@@ -78,6 +78,11 @@ public class WebDAVAdminController extends FormBasicController {
enableTermsFoldersEl.select("xx", webDAVModule.isTermsFoldersEnabled());
enableTermsFoldersEl.addActionListener(FormEvent.ONCHANGE);
enableTermsFoldersEl.setEnabled(enabled);
+
+ prependReferenceEl = uifactory.addCheckboxesHorizontal("webdavPrepend", "webdav.prepend.reference", formLayout, new String[]{"xx"}, values);
+ prependReferenceEl.select("xx", webDAVModule.isPrependCourseReferenceToTitle());
+ prependReferenceEl.addActionListener(FormEvent.ONCHANGE);
+ prependReferenceEl.setEnabled(enabled);
uifactory.addSpacerElement("spacer2", formLayout, false);
@@ -122,6 +127,9 @@ public class WebDAVAdminController extends FormBasicController {
} else if(source == learnersBookmarkEl) {
boolean enabled = learnersBookmarkEl.isAtLeastSelected(1);
webDAVModule.setEnableLearnersBookmarksCourse(enabled);
+ } else if(source == prependReferenceEl) {
+ boolean enabled = prependReferenceEl.isAtLeastSelected(1);
+ webDAVModule.setPrependCourseReferenceToTitle(enabled);
}
super.formInnerEvent(ureq, source, event);
}
diff --git a/src/main/java/org/olat/core/commons/services/webdav/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/core/commons/services/webdav/ui/_i18n/LocalStrings_de.properties
index bcb46a6c11feef718b6bdcc1672b2793b84bbf5c..fed9cf9c09159814e4111ad517a3cfe41a9dacf4 100644
--- a/src/main/java/org/olat/core/commons/services/webdav/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/core/commons/services/webdav/ui/_i18n/LocalStrings_de.properties
@@ -2,17 +2,7 @@
admin.menu.title=WebDAV
admin.menu.title.alt=WebDAV Zugang
admin.webdav.description=Mit Hilfe von WebDAV k\u00F6nnen Sie OpenOLAT Ordner auf Ihrem lokalen Desktop wie lokale Ordner anzeigen und verwenden. Konfigurieren Sie ob diese Funktion allen Benutzern Systemweit zur Verf\u00FCgung stehen soll. Bitte lesen sie die Kontexthilfe.
-
-
-
-
-
-
-
-
-
core.webdav=WebDAV
-
webdav.digest=Digest Authentication bei HTTP Zugang verwenden
webdav.link=WebDAV Links anzeigen
webdav.module=WebDAV Zugang
@@ -20,3 +10,4 @@ webdav.on=ein
webdav.termsfolders=Kurse nach Semesterdaten gruppieren
webdav.for.learners.participants=Zugriff für Studenten Kursen
webdav.for.learners.bookmarks=Zugriff für Studenten Favoriten
+webdav.prepend.reference=Kursreferenz zu Titel voranstellen
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/commons/services/webdav/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/core/commons/services/webdav/ui/_i18n/LocalStrings_en.properties
index 7ed0539a648e173e3c27ba4a6b08b402d8652904..b03f1dc2aea1a59c5a22b974b0f74320d0c524ec 100644
--- a/src/main/java/org/olat/core/commons/services/webdav/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/core/commons/services/webdav/ui/_i18n/LocalStrings_en.properties
@@ -2,17 +2,7 @@
admin.menu.title=WebDAV
admin.menu.title.alt=WebDAV access
admin.webdav.description=Using WebDAV you can mount and use OpenOLAT folders on your local desktop as if they were local folders. Enable this feature to make it accessable to all users of your platform. Please read the context help.
-
-
-
-
-
-
-
-
-
core.webdav=WebDAV
-
webdav.digest=Digest Authentication for HTTP access
webdav.link=Show WebDAV links
webdav.module=WebDAV access
@@ -20,4 +10,4 @@ webdav.on=enabled
webdav.termsfolders=Group courses by semester terms
webdav.for.learners.participants=Enable access for courses where user is participant
webdav.for.learners.bookmarks=Enable for courses that users marked as favorite
-
+webdav.prepend.reference=Prepend course reference to title
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/gui/components/table/TableRenderer.java b/src/main/java/org/olat/core/gui/components/table/TableRenderer.java
index 89367ce3e381fa3df20ec3f13e916a294733b83b..ad9cd7eabb314c23f909303cdb3d097b260d45be 100644
--- a/src/main/java/org/olat/core/gui/components/table/TableRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/table/TableRenderer.java
@@ -153,10 +153,6 @@ public class TableRenderer extends DefaultComponentRenderer {
.append("\" class=\"btn btn-default\" onclick=\"o_TableMultiActionEvent('").append(formName).append("','").append(multiSelectActionIdentifer).append("');\"><span>").append(value).append("</span></button> ");
}
target.append("</div>");
- // add hidden action command placeholders to the form. these will be manipulated when
- // the user clicks on a regular link within the table to e.g. re-sort the columns.
- target.append("<input type=\"hidden\" name=\"cmd\" value=\"\" />")
- .append("<input type=\"hidden\" name=\"param\" value=\"\" />");
}
private void appendTablePageing(StringOutput target, Translator translator, Table table, int rows,
@@ -167,9 +163,10 @@ public class TableRenderer extends DefaultComponentRenderer {
int maxpageid = (int) Math.ceil(((double) rows / (double) resultsPerPage));
target.append("<div class='o_table_pagination'><ul class='pagination'>");
- appendTablePageingBackLink(target, pageid, ajaxEnabled, ubu);
- addPageNumberLinks(target, pageid, maxpageid, ajaxEnabled, ubu);
- appendTablePageingNextLink(target, rows, resultsPerPage, pageid, ajaxEnabled, ubu);
+ String formName = "tb_ms_" + table.hashCode();
+ appendTablePageingBackLink(target, formName, pageid);
+ appendPageNumberLinks(target, formName, pageid, maxpageid, ubu);
+ appendTablePageingNextLink(target, formName, rows, resultsPerPage, pageid);
appendTablePageingShowallLink(target, translator, table, ajaxEnabled, ubu);
target.append("</ul></div>");
@@ -186,26 +183,26 @@ public class TableRenderer extends DefaultComponentRenderer {
}
}
- private void appendTablePageingNextLink(StringOutput target, int rows, int resultsPerPage, int pageid, boolean ajaxEnabled, URLBuilder ubu) {
+ private void appendTablePageingNextLink(StringOutput target, String formName, int rows, int resultsPerPage, int pageid) {
boolean enabled = ((pageid * resultsPerPage) < rows);
target.append("<li").append(" class='disabled'", !enabled).append("><a ");
if(enabled) {
- ubu.buildHrefAndOnclick(target, ajaxEnabled,
- new NameValuePair(Table.FORM_CMD,Table.COMMAND_PAGEACTION),
- new NameValuePair(Table.FORM_PARAM, Table.COMMAND_PAGEACTION_FORWARD));
+ target.append(" href=\"javascript:;\" onclick=\"o_XHRSubmit('")
+ .append(formName).append("','").append(Table.FORM_CMD).append("','").append(Table.COMMAND_PAGEACTION)
+ .append("','").append(Table.FORM_PARAM).append("','").append(Table.COMMAND_PAGEACTION_FORWARD).append("'); return false;\"");
} else {
target.append("href=\"javascript:;\"");
}
target.append(">»").append("</a></li>");
}
- private void appendTablePageingBackLink(StringOutput target, int pageid, boolean ajaxEnabled, URLBuilder ubu) {
+ private void appendTablePageingBackLink(StringOutput target, String formName, int pageid) {
boolean enabled = pageid > 1;
target.append("<li").append(" class='disabled'", !enabled).append("><a ");
if(enabled) {
- ubu.buildHrefAndOnclick(target, ajaxEnabled,
- new NameValuePair(Table.FORM_CMD,Table.COMMAND_PAGEACTION),
- new NameValuePair(Table.FORM_PARAM, Table.COMMAND_PAGEACTION_BACKWARD));
+ target.append(" href=\"javascript:;\" onclick=\"o_XHRSubmit('")
+ .append(formName).append("','").append(Table.FORM_CMD).append("','").append(Table.COMMAND_PAGEACTION)
+ .append("','").append(Table.FORM_PARAM).append("','").append(Table.COMMAND_PAGEACTION_BACKWARD).append("'); return false;\"");
} else {
target.append("href=\"javascript:;\"");
}
@@ -376,9 +373,9 @@ public class TableRenderer extends DefaultComponentRenderer {
* @param pageid
* @param maxpageid
*/
- private void addPageNumberLinks(StringOutput target, int pageid, int maxpageid, boolean ajaxEnabled, URLBuilder ubu) {
+ private void appendPageNumberLinks(StringOutput target, String formName, int pageid, int maxpageid, URLBuilder ubu) {
if (maxpageid < 12) {
- addPageNumberLinksForSimpleCase(target, pageid, maxpageid, ajaxEnabled, ubu);
+ addPageNumberLinksForSimpleCase(target, formName, pageid, maxpageid);
} else {
int powerOf10 = String.valueOf(maxpageid).length() - 1;
int maxStepSize = (int) Math.pow(10, powerOf10);
@@ -407,17 +404,16 @@ public class TableRenderer extends DefaultComponentRenderer {
}
isNear = (i > (pageid - nearleft) && i < (pageid + nearright));
if (i == 1 || i == maxpageid || isStep || isNear) {
- appendPagenNumberLink(target, pageid, i, ajaxEnabled, ubu);
+ appendPagenNumberLink(target, formName, pageid, i);
}
}
}
}
- private void appendPagenNumberLink(StringOutput target, int pageid, int i, boolean ajaxEnabled, URLBuilder ubu) {
- target.append("<li").append(" class='active'", pageid == i).append("><a ");
- ubu.buildHrefAndOnclick(target, ajaxEnabled,
- new NameValuePair(Table.FORM_CMD, Table.COMMAND_PAGEACTION),
- new NameValuePair(Table.FORM_PARAM, i)).append(">")
+ private void appendPagenNumberLink(StringOutput target, String formName, int pageid, int i) {
+ target.append("<li").append(" class='active'", pageid == i).append("><a href=\"#\" onclick=\"o_XHRSubmit('")
+ .append(formName).append("','").append(Table.FORM_CMD).append("','").append(Table.COMMAND_PAGEACTION)
+ .append("','").append(Table.FORM_PARAM).append("','").append(i).append("'); return false;\">")
.append(i).append("</a></li>");
}
@@ -431,9 +427,9 @@ public class TableRenderer extends DefaultComponentRenderer {
return newStepSize;
}
- private void addPageNumberLinksForSimpleCase(final StringOutput target, int pageid, int maxpageid, boolean ajaxEnabled, URLBuilder ubu) {
+ private void addPageNumberLinksForSimpleCase(StringOutput target, String formName, int pageid, int maxpageid) {
for (int i = 1; i <= maxpageid; i++) {
- appendPagenNumberLink(target, pageid, i, ajaxEnabled, ubu);
+ appendPagenNumberLink(target, formName, pageid, i);
}
}
}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/gui/components/table/TableSortRenderer.java b/src/main/java/org/olat/core/gui/components/table/TableSortRenderer.java
index 446d58f37f83656d0bc921524279a6ccd7732bce..ceffa1c9a679808d01d536b4d4db47e1a4b95a9e 100644
--- a/src/main/java/org/olat/core/gui/components/table/TableSortRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/table/TableSortRenderer.java
@@ -22,7 +22,6 @@ package org.olat.core.gui.components.table;
import org.apache.commons.lang.StringEscapeUtils;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.DefaultComponentRenderer;
-import org.olat.core.gui.components.form.flexible.impl.NameValuePair;
import org.olat.core.gui.render.RenderResult;
import org.olat.core.gui.render.Renderer;
import org.olat.core.gui.render.StringOutput;
@@ -43,6 +42,7 @@ class TableSortRenderer extends DefaultComponentRenderer {
TableSort sorter = (TableSort)source;
Table table = sorter.getTable();
String id = sorter.getDispatchID();
+ String formName = "tb_ms_" + table.hashCode();
sb.append("<div id='o_c").append(id).append("' class='btn-group'>")
.append("<button id='table-button-sorters-").append(id).append("' type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>")
@@ -59,10 +59,9 @@ class TableSortRenderer extends DefaultComponentRenderer {
ColumnDescriptor cd = table.getColumnDescriptor(i);
// header either a link or not
if (cd.isSortingAllowed()) {
- sb.append("<li><a ");
- ubu.buildHrefAndOnclick(sb, false,
- new NameValuePair(Table.FORM_CMD, Table.COMMAND_SORTBYCOLUMN),
- new NameValuePair(Table.FORM_PARAM, i))
+ sb.append("<li><a href=\"javascript:;\" onclick=\"o_XHRSubmit('")
+ .append(formName).append("','").append(Table.FORM_CMD).append("','").append(Table.COMMAND_SORTBYCOLUMN)
+ .append("','").append(Table.FORM_PARAM).append("','").append(i).append("'); return false;\"")
.append(" title=\"")
.append(StringEscapeUtils.escapeHtml(translator.translate("row.sort"))).append("\">");
diff --git a/src/main/java/org/olat/core/gui/control/winmgr/AjaxController.java b/src/main/java/org/olat/core/gui/control/winmgr/AjaxController.java
index af8c16db91ba6f5f4668a97692c2292f57a3f902..09cce3337165efb2e61dea656edcc84bb5def4ec 100644
--- a/src/main/java/org/olat/core/gui/control/winmgr/AjaxController.java
+++ b/src/main/java/org/olat/core/gui/control/winmgr/AjaxController.java
@@ -71,7 +71,6 @@ import org.olat.core.logging.AssertException;
import org.olat.core.logging.OLog;
import org.olat.core.logging.Tracing;
import org.olat.core.util.FileUtils;
-import org.olat.core.util.Formatter;
import org.olat.core.util.StringHelper;
import org.olat.core.util.Util;
import org.olat.core.util.WebappHelper;
@@ -291,9 +290,8 @@ public class AjaxController extends DefaultController {
private void appendBusinessPathInfos(UserRequest ureq, Writer writer) throws IOException {
ChiefController ctrl = wboImpl.getChiefController();
String documentTitle = ctrl == null ? "" : ctrl.getWindowTitle();
- StringBuilder docTitle = Formatter.escapeDoubleQuotesWithBackslash(documentTitle);
- writer.append(",\"documentTitle\":\"").append(docTitle).append("\"");
-
+ writer.append(",\"documentTitle\":").append(JSONObject.quote(documentTitle));
+
StringBuilder bc = new StringBuilder(128);
HistoryPoint p = ureq.getUserSession().getLastHistoryPoint();
if(p != null && StringHelper.containsNonWhitespace(p.getBusinessPath())) {
@@ -301,8 +299,8 @@ public class AjaxController extends DefaultController {
String uriPrefix = wboImpl.getWindow().getUriPrefix();
bc.append(uriPrefix)
.append(BusinessControlFactory.getInstance().getAsRestPart(ces, true));
- writer.append(",\"businessPath\":\"").append(bc).append("\"");
- writer.append(",\"historyPointId\":\"").append(p.getUuid()).append("\"");
+ writer.append(",\"businessPath\":").append(JSONObject.quote(bc.toString()));
+ writer.append(",\"historyPointId\":").append(JSONObject.quote(p.getUuid()));
}
}
diff --git a/src/main/java/org/olat/core/util/Formatter.java b/src/main/java/org/olat/core/util/Formatter.java
index e6f6676c2a992cb52b60eabbf1808c03d2915a2a..3c4af27bf598442fc3666cd32f9eae9f691e1478 100644
--- a/src/main/java/org/olat/core/util/Formatter.java
+++ b/src/main/java/org/olat/core/util/Formatter.java
@@ -357,30 +357,6 @@ public class Formatter {
return sb;
}
- /**
- * Escape " with \" in strings
- * @param source
- * @return escaped string
- */
- public static StringBuilder escapeDoubleQuotesWithBackslash(String source) {
- StringBuilder sb = new StringBuilder(300);
- if (source != null) {
- int len = source.length();
- char[] cs = source.toCharArray();
- for (int i = 0; i < len; i++) {
- char c = cs[i];
- switch (c) {
- case '"':
- sb.append("\\\"");
- break;
- default:
- sb.append(c);
- }
- }
- }
- return sb;
- }
-
/**
* Escape " with \" and ' with \' in strings
* @param source
diff --git a/src/main/java/org/olat/course/CoursefolderWebDAVMergeSource.java b/src/main/java/org/olat/course/CoursefolderWebDAVMergeSource.java
index aca632ed1662d155e79ad1b24035393b99435fa2..59e36413c44249949eee98e8398b5e64e9b21e14 100644
--- a/src/main/java/org/olat/course/CoursefolderWebDAVMergeSource.java
+++ b/src/main/java/org/olat/course/CoursefolderWebDAVMergeSource.java
@@ -31,6 +31,7 @@ import org.olat.core.commons.services.webdav.WebDAVModule;
import org.olat.core.commons.services.webdav.manager.WebDAVMergeSource;
import org.olat.core.commons.services.webdav.servlets.RequestUtil;
import org.olat.core.id.IdentityEnvironment;
+import org.olat.core.util.StringHelper;
import org.olat.core.util.vfs.NamedContainerImpl;
import org.olat.core.util.vfs.VFSContainer;
import org.olat.core.util.vfs.VirtualContainer;
@@ -71,21 +72,22 @@ class CoursefolderWebDAVMergeSource extends WebDAVMergeSource {
terms = new HashMap<String, VFSContainer>();
noTermContainer = new VirtualContainer("other");
}
+ boolean prependReference = webDAVModule.isPrependCourseReferenceToTitle();
Set<RepositoryEntry> duplicates = new HashSet<>();
List<RepositoryEntry> editorEntries = repositoryManager.queryByOwner(getIdentity(), "CourseModule");
- appendCourses(editorEntries, true, containers, useTerms, terms, noTermContainer, duplicates);
+ appendCourses(editorEntries, true, containers, useTerms, terms, noTermContainer, prependReference, duplicates);
//add courses as participant
if(webDAVModule.isEnableLearnersParticipatingCourses()) {
List<RepositoryEntry> participantEntries = repositoryManager.getLearningResourcesAsStudent(getIdentity(), "CourseModule", 0, -1);
- appendCourses(participantEntries, false, containers, useTerms, terms, noTermContainer, duplicates);
+ appendCourses(participantEntries, false, containers, useTerms, terms, noTermContainer, prependReference, duplicates);
}
//add bookmarked courses
if(webDAVModule.isEnableLearnersBookmarksCourse()) {
List<RepositoryEntry> bookmarkedEntries = repositoryManager.getLearningResourcesAsBookmark(getIdentity(), identityEnv.getRoles(), "CourseModule", 0, -1);
- appendCourses(bookmarkedEntries, false, containers, useTerms, terms, noTermContainer, duplicates);
+ appendCourses(bookmarkedEntries, false, containers, useTerms, terms, noTermContainer, prependReference, duplicates);
}
if (useTerms) {
@@ -100,7 +102,7 @@ class CoursefolderWebDAVMergeSource extends WebDAVMergeSource {
private void appendCourses(List<RepositoryEntry> courseEntries, boolean editor, List<VFSContainer> containers,
boolean useTerms, Map<String, VFSContainer> terms, VirtualContainer noTermContainer,
- Set<RepositoryEntry> duplicates) {
+ boolean prependReference, Set<RepositoryEntry> duplicates) {
// Add all found repo entries to merge source
for (RepositoryEntry re:courseEntries) {
@@ -109,7 +111,11 @@ class CoursefolderWebDAVMergeSource extends WebDAVMergeSource {
}
duplicates.add(re);
- String courseTitle = RequestUtil.normalizeFilename(re.getDisplayname());
+ String displayName = re.getDisplayname();
+ if(prependReference && StringHelper.containsNonWhitespace(re.getExternalId())) {
+ displayName = re.getExternalId() + " " + displayName;
+ }
+ String courseTitle = RequestUtil.normalizeFilename(displayName);
NamedContainerImpl cfContainer = new CoursefolderWebDAVNamedContainer(courseTitle, re, editor ? null : identityEnv);
if (useTerms) {
diff --git a/src/main/java/org/olat/course/MergedCourseContainer.java b/src/main/java/org/olat/course/MergedCourseContainer.java
index 74d65fff834d5ee0d1b8f2be159a695ec35d6c40..878caf03a0c5a0433c0202d82ed3c79c6068df11 100644
--- a/src/main/java/org/olat/course/MergedCourseContainer.java
+++ b/src/main/java/org/olat/course/MergedCourseContainer.java
@@ -149,6 +149,7 @@ public class MergedCourseContainer extends MergeSource {
MergeSource courseNodeContainer;
if (courseNodeChild instanceof BCCourseNode) {
final BCCourseNode bcNode = (BCCourseNode) courseNodeChild;
+ bcNode.updateModuleConfigDefaults(false);
// add folder not to merge source. Use name and node id to have unique name
VFSContainer rootFolder = null;
String subpath = bcNode.getModuleConfiguration().getStringValue(BCCourseNodeEditController.CONFIG_SUBPATH);
@@ -245,6 +246,7 @@ public class MergedCourseContainer extends MergeSource {
MergeSource courseNodeContainer;
if (child instanceof BCCourseNode) {
final BCCourseNode bcNode = (BCCourseNode) child;
+ bcNode.updateModuleConfigDefaults(false);
// add folder not to merge source. Use name and node id to have unique name
String path;
VFSContainer rootFolder = null;
diff --git a/src/main/java/org/olat/course/nodes/BCCourseNode.java b/src/main/java/org/olat/course/nodes/BCCourseNode.java
index 69a205d66f6a1c74942c77940996a14131262310..83709caf8e56950b3b23097f33cdb4779c434c4b 100644
--- a/src/main/java/org/olat/course/nodes/BCCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/BCCourseNode.java
@@ -73,8 +73,6 @@ import org.olat.course.run.userview.UserCourseEnvironmentImpl;
import org.olat.course.run.userview.VisibleTreeFilter;
import org.olat.modules.ModuleConfiguration;
import org.olat.repository.RepositoryEntry;
-import org.olat.resource.references.ReferenceManager;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* Description:<br>
@@ -84,8 +82,6 @@ public class BCCourseNode extends AbstractAccessableCourseNode {
private static final long serialVersionUID = 6887400715976544402L;
private static final String PACKAGE_BC = Util.getPackageName(BCCourseNodeRunController.class);
private static final String TYPE = "bc";
- @Autowired
- private ReferenceManager referenceManager;
/**
* Condition.getCondition() == null means no precondition, always accessible
@@ -145,24 +141,25 @@ public class BCCourseNode extends AbstractAccessableCourseNode {
public Controller createPeekViewRunController(UserRequest ureq, WindowControl wControl, UserCourseEnvironment userCourseEnv,
NodeEvaluation ne) {
if (ne.isAtLeastOneAccessible()) {
+ updateModuleConfigDefaults(false);
+
// Create a folder peekview controller that shows the latest two entries
- String path ="";
VFSContainer rootFolder = null;
- if(getModuleConfiguration().getBooleanSafe(BCCourseNodeEditController.CONFIG_AUTO_FOLDER)){
- path = getFoldernodePathRelToFolderBase(userCourseEnv.getCourseEnvironment(), this);
- rootFolder = new OlatRootFolderImpl(path, null);
- }else{
- VFSItem pathItem = userCourseEnv.getCourseEnvironment().getCourseFolderContainer().resolve(getModuleConfiguration().getStringValue(BCCourseNodeEditController.CONFIG_SUBPATH));
- if(pathItem == null){
- return super.createPeekViewRunController(ureq, wControl, userCourseEnv, ne);
- }
- if(pathItem instanceof VFSContainer){
- rootFolder = (VFSContainer) pathItem;
+ if(getModuleConfiguration().getBooleanSafe(BCCourseNodeEditController.CONFIG_AUTO_FOLDER)) {
+ rootFolder = getNodeFolderContainer(this, userCourseEnv.getCourseEnvironment());
+ } else {
+ String subPath = getModuleConfiguration().getStringValue(BCCourseNodeEditController.CONFIG_SUBPATH, "");
+ VFSItem item = userCourseEnv.getCourseEnvironment().getCourseFolderContainer().resolve(subPath);
+ if(item instanceof VFSContainer) {
+ rootFolder = (VFSContainer)item;
}
}
+
+ if(rootFolder == null) {
+ return super.createPeekViewRunController(ureq, wControl, userCourseEnv, ne);
+ }
rootFolder.setDefaultItemFilter(new SystemItemFilter());
- Controller peekViewController = new BCPeekviewController(ureq, wControl, rootFolder, getIdent(), 4);
- return peekViewController;
+ return new BCPeekviewController(ureq, wControl, rootFolder, getIdent(), 4);
} else {
// use standard peekview
return super.createPeekViewRunController(ureq, wControl, userCourseEnv, ne);
@@ -198,11 +195,8 @@ public class BCCourseNode extends AbstractAccessableCourseNode {
}
public boolean isSharedFolder(){
- if(this.getModuleConfiguration().getStringValue(BCCourseNodeEditController.CONFIG_SUBPATH, "").startsWith("/_sharedfolder")){
- return true;
- }else{
- return false;
- }
+ return getModuleConfiguration().getStringValue(BCCourseNodeEditController.CONFIG_SUBPATH, "")
+ .startsWith("/_sharedfolder");
}
/**
diff --git a/src/main/java/org/olat/course/nodes/ENCourseNode.java b/src/main/java/org/olat/course/nodes/ENCourseNode.java
index b2cdb300e11c8dfcb147839b737a16eae0e2ab0e..f91d50c08c29d62ca2d434da0541a8367158b1a6 100644
--- a/src/main/java/org/olat/course/nodes/ENCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/ENCourseNode.java
@@ -62,7 +62,7 @@ import org.olat.repository.RepositoryEntry;
* <P>
*
* Initial Date: Sep 8, 2004
- * @author Felix Jost, Florian Gn�gi
+ * @author Felix Jost, Florian Gnaegi
*/
public class ENCourseNode extends AbstractAccessableCourseNode {
private static final String PACKAGE = Util.getPackageName(ENCourseNode.class);
diff --git a/src/main/java/org/olat/course/nodes/basiclti/LTIConfigForm.java b/src/main/java/org/olat/course/nodes/basiclti/LTIConfigForm.java
index 64216e47c654c4ca708ae3cbc57d830af9e4ed4a..c9b674486392cb821f205666cddf0c44c9478993 100644
--- a/src/main/java/org/olat/course/nodes/basiclti/LTIConfigForm.java
+++ b/src/main/java/org/olat/course/nodes/basiclti/LTIConfigForm.java
@@ -568,16 +568,15 @@ public class LTIConfigForm extends FormBasicController {
if(isAssessableEl.isAtLeastSelected(1)) {
config.setBooleanEntry(BasicLTICourseNode.CONFIG_KEY_HAS_SCORE_FIELD, Boolean.TRUE);
- String scaleValue = scaleFactorEl.getValue();
- Float scaleVal = Float.parseFloat(scaleValue);
- if(scaleVal.floatValue() > 0.0f) {
+ Float scaleVal = getFloat(scaleFactorEl.getValue());
+ if(scaleVal != null && scaleVal.floatValue() > 0.0f) {
config.set(BasicLTICourseNode.CONFIG_KEY_SCALEVALUE, scaleVal);
} else {
config.remove(BasicLTICourseNode.CONFIG_KEY_SCALEVALUE);
}
String cutValue = cutValueEl.getValue();
- Float cutVal = (StringHelper.containsNonWhitespace(cutValue)) ? Float.parseFloat(cutValue) : null;
+ Float cutVal = getFloat(cutValueEl.getValue());
if(cutVal != null && cutVal.floatValue() > 0.0f) {
config.setBooleanEntry(BasicLTICourseNode.CONFIG_KEY_HAS_PASSED_FIELD, Boolean.TRUE);
config.set(BasicLTICourseNode.CONFIG_KEY_PASSED_CUT_VALUE, cutValue);
@@ -610,6 +609,18 @@ public class LTIConfigForm extends FormBasicController {
return config;
}
+ private Float getFloat(String text) {
+ Float floatValue = null;
+ if(StringHelper.containsNonWhitespace(text)) {
+ try {
+ floatValue = Float.parseFloat(text);
+ } catch(Exception e) {
+ //can happens
+ }
+ }
+ return floatValue;
+ }
+
private String getCustomConfig() {
StringBuilder sb = new StringBuilder();
for(NameValuePair pair:nameValuePairs) {
diff --git a/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditChooseFolderForm.java b/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditChooseFolderForm.java
index 01dfc1e56d06e36d0887d06245ada42c3a509622..3c9e1d22a572bd1fb0f2b42893eb9f56d0f4c9db 100644
--- a/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditChooseFolderForm.java
+++ b/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditChooseFolderForm.java
@@ -39,18 +39,14 @@ import org.olat.core.util.vfs.VFSContainer;
*/
public class BCCourseNodeEditChooseFolderForm extends BasicController {
-
- private FolderTreeModel treeModel;
- private MenuTree selectionTree;
- private VelocityContainer chooseVC;
- private Link selectLink;
- private Link cancelLink;
+ private final FolderTreeModel treeModel;
+ private final MenuTree selectionTree;
+ private final Link selectLink, cancelLink;
private String subpath;
-
public BCCourseNodeEditChooseFolderForm(UserRequest ureq, WindowControl wControl, VFSContainer namedContainer) {
super(ureq, wControl);
- chooseVC = createVelocityContainer("chooseFolder");
+ VelocityContainer chooseVC = createVelocityContainer("chooseFolder");
treeModel = new FolderTreeModel(ureq.getLocale(), namedContainer, true, false, true, true, new VFSFolderNodeFilter());
selectionTree = new MenuTree("stTree");
@@ -66,21 +62,18 @@ public class BCCourseNodeEditChooseFolderForm extends BasicController {
@Override
protected void doDispose() {
- // TODO Auto-generated method stub
+ //
}
@Override
protected void event(UserRequest ureq, Component source, Event event) {
if(source == cancelLink){
- fireEvent(ureq, event);
- }
- if(source == selectionTree){
+ fireEvent(ureq, Event.CANCELLED_EVENT);
+ } else if(source == selectionTree) {
TreeEvent te = (TreeEvent)event;
subpath = treeModel.getSelectedPath(treeModel.getNodeById(te.getNodeId()));
+ } else if(source == selectLink){
+ fireEvent(ureq, new SelectFolderEvent(subpath));
}
- if(source == selectLink){
- fireEvent(ureq, new Event(subpath));
- }
-
}
}
diff --git a/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditController.java b/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditController.java
index 85555e563d534c495410a42f4d9822833db9d5c0..da7b5c1129671dc2b86b931115e3abe8b4769954 100644
--- a/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditController.java
+++ b/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditController.java
@@ -104,11 +104,11 @@ public class BCCourseNodeEditController extends ActivateableTabbableDefaultContr
uploaderCondContr = new ConditionEditController(ureq, getWindowControl(),
uploadCondition, AssessmentHelper
.getAssessableNodes(course.getEditorTreeModel(), bcNode), euce);
- this.listenTo(uploaderCondContr);
+ listenTo(uploaderCondContr);
- if(bcNode.getModuleConfiguration().getStringValue(CONFIG_SUBPATH).startsWith("/_sharedfolder")){
+ if(bcNode.getModuleConfiguration().getStringValue(CONFIG_SUBPATH, "").startsWith("/_sharedfolder")){
accessabiliryContent.contextPut("uploadable", false);
- }else{
+ } else {
accessabiliryContent.contextPut("uploadable", true);
}
accessabiliryContent.put("uploadCondition", uploaderCondContr.getInitialComponent());
@@ -138,7 +138,7 @@ public class BCCourseNodeEditController extends ActivateableTabbableDefaultContr
if(bcNode.getModuleConfiguration().getBooleanSafe(CONFIG_AUTO_FOLDER)){
target = BCCourseNode.getNodeFolderContainer(bcNode, course.getCourseEnvironment());
}else{
- String path = bcNode.getModuleConfiguration().getStringValue(CONFIG_SUBPATH);
+ String path = bcNode.getModuleConfiguration().getStringValue(CONFIG_SUBPATH, "");
VFSItem pathItem = course.getCourseFolderContainer().resolve(path);
if(pathItem instanceof VFSContainer){
target = (VFSContainer) pathItem;
@@ -178,7 +178,7 @@ public class BCCourseNodeEditController extends ActivateableTabbableDefaultContr
}
}
if (source == folderPathChoose){
- if(bcNode.getModuleConfiguration().getStringValue(CONFIG_SUBPATH).startsWith("/_sharedfolder")){
+ if(bcNode.getModuleConfiguration().getStringValue(CONFIG_SUBPATH, "").startsWith("/_sharedfolder")){
accessabiliryContent.contextPut("uploadable", false);
}else{
accessabiliryContent.contextPut("uploadable", true);
diff --git a/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditCreateFolderForm.java b/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditCreateFolderForm.java
index 6dd7a135d268ce140fd970428c7a38806618e2aa..bb402e1d593c5be75966d29cb3cf80c537a0831b 100644
--- a/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditCreateFolderForm.java
+++ b/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditCreateFolderForm.java
@@ -20,16 +20,14 @@
package org.olat.course.nodes.bc;
import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.form.flexible.FormItem;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
-import org.olat.core.gui.components.form.flexible.elements.FormLink;
import org.olat.core.gui.components.form.flexible.elements.TextElement;
import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
-import org.olat.core.gui.components.form.flexible.impl.FormEvent;
-import org.olat.core.gui.components.link.Link;
+import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
+import org.olat.core.util.StringHelper;
import org.olat.core.util.vfs.VFSContainer;
import org.olat.core.util.vfs.VFSManager;
import org.olat.course.ICourse;
@@ -42,10 +40,9 @@ import org.olat.course.nodes.BCCourseNode;
*/
public class BCCourseNodeEditCreateFolderForm extends FormBasicController {
- private FormLink createButton;
private TextElement createPath;
private VFSContainer courseFolder;
- private BCCourseNode bcNode;
+ private final BCCourseNode bcNode;
public BCCourseNodeEditCreateFolderForm(UserRequest ureq, WindowControl wControl, ICourse course, BCCourseNode bcNode) {
super(ureq, wControl);
@@ -58,32 +55,45 @@ public class BCCourseNodeEditCreateFolderForm extends FormBasicController {
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
createPath = uifactory.addTextElement("createPath", "createPath", 100, "/"+bcNode.getShortTitle(), formLayout);
createPath.setLabel("createPath", null);
- createButton = uifactory.addFormLink("createButton", formLayout, Link.BUTTON);
+
+ FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("createButton", getTranslator());
+ formLayout.add(buttonLayout);
+ uifactory.addFormSubmitButton("createButton", buttonLayout);
+ uifactory.addFormCancelButton("cancel", buttonLayout, ureq, getWindowControl());
+ }
+
+ @Override
+ protected void doDispose() {
+ //
}
@Override
- protected void formOK(UserRequest ureq) {
- // TODO Auto-generated method stub
+ protected boolean validateFormLogic(UserRequest ureq) {
+ boolean allOk = true;
+
+ createPath.clearError();
+ if(!StringHelper.containsNonWhitespace(createPath.getValue())) {
+ createPath.setErrorKey("form.legende.mandatory", null);
+ allOk &= false;
+ }
+
+ return allOk & super.validateFormLogic(ureq);
}
@Override
- protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
- if(source == createButton){
- String path = createPath.getValue();
- path = VFSManager.sanitizePath(path);
+ protected void formOK(UserRequest ureq) {
+ String path = createPath.getValue();
+ path = VFSManager.sanitizePath(path);
- if(VFSManager.resolveOrCreateContainerFromPath(courseFolder, path) != null){
- fireEvent(ureq, new Event(path));
- }else{
- logInfo("something went wrong with the creation", null);
- }
+ if(VFSManager.resolveOrCreateContainerFromPath(courseFolder, path) != null) {
+ fireEvent(ureq, new SelectFolderEvent(path));
+ } else {
+ logError("something went wrong with the creation", null);
}
}
-
@Override
- protected void doDispose() {
- // TODO Auto-generated method stub
-
+ protected void formCancelled(UserRequest ureq) {
+ fireEvent(ureq, Event.CANCELLED_EVENT);
}
}
diff --git a/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditForm.java b/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditForm.java
index dd7b7430c13a56b08eda7df683581b839d7599ee..a5d03ff30963dc8c47f2a3da98225340f4bec791 100644
--- a/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditForm.java
+++ b/src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditForm.java
@@ -27,7 +27,6 @@ import org.olat.core.commons.services.notifications.Publisher;
import org.olat.core.commons.services.notifications.PublisherData;
import org.olat.core.commons.services.notifications.SubscriptionContext;
import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.form.flexible.FormItem;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
import org.olat.core.gui.components.form.flexible.elements.FormLink;
@@ -131,8 +130,7 @@ public class BCCourseNodeEditForm extends FormBasicController implements Control
@Override
protected void formOK(UserRequest ureq) {
- // TODO Auto-generated method stub
-
+ //
}
@Override
@@ -169,48 +167,57 @@ public class BCCourseNodeEditForm extends FormBasicController implements Control
}
fireEvent(ureq, NodeEditController.NODECONFIG_CHANGED_EVENT);
createFolder.setVisible(folderTargetChoose.isSelected(1));
- }
- if(source == createFolder){
+ } else if(source == createFolder){
createFolderForm = new BCCourseNodeEditCreateFolderForm(ureq, getWindowControl(), course, node);
listenTo(createFolderForm);
- cmc = new CloseableModalController(getWindowControl(), translate("close"), createFolderForm.getInitialComponent());
+
+ String title = translate("chooseFolder");
+ cmc = new CloseableModalController(getWindowControl(), translate("close"), createFolderForm.getInitialComponent(), true, title);
+ listenTo(cmc);
cmc.activate();
- }
- if (source == chooseFolder){
+ } else if (source == chooseFolder){
VFSContainer namedContainer = course.getCourseFolderContainer();
chooseForm = new BCCourseNodeEditChooseFolderForm(ureq, getWindowControl(), namedContainer);
listenTo(chooseForm);
- cmc = new CloseableModalController(getWindowControl(), translate("close"),chooseForm.getInitialComponent());
+ String title = translate("createFolder");
+ cmc = new CloseableModalController(getWindowControl(), translate("close"), chooseForm.getInitialComponent(), true, title);
+ listenTo(cmc);
cmc.activate();
- return;
}
}
@Override
protected void event(UserRequest ureq, Controller source, Event event) {
if(source == createFolderForm){
- cmc.deactivate();
- String subpath = event.getCommand();
- VFSContainer selectedContainer = (VFSContainer) course.getCourseFolderContainer().resolve(subpath);
- updatePublisher(selectedContainer);
- node.getModuleConfiguration().setStringValue(BCCourseNodeEditController.CONFIG_SUBPATH, subpath);
- subPath.setValue(event.getCommand());
- if(node.isSharedFolder()){
+ if(Event.CANCELLED_EVENT == event) {
+ cmc.deactivate();
+ } else if(event instanceof SelectFolderEvent) {
+ cmc.deactivate();
+ SelectFolderEvent sfe = (SelectFolderEvent)event;
+ String subpath = sfe.getSubpath();
+ VFSContainer selectedContainer = (VFSContainer) course.getCourseFolderContainer().resolve(subpath);
+ updatePublisher(selectedContainer);
+ node.getModuleConfiguration().setStringValue(BCCourseNodeEditController.CONFIG_SUBPATH, subpath);
+ subPath.setValue(event.getCommand());
+ fireEvent(ureq, NodeEditController.NODECONFIG_CHANGED_EVENT);
+ }
+
+ if(node.isSharedFolder()) {
sharedFolderInfo.setVisible(true);
- }else{
+ } else {
sharedFolderInfo.setVisible(false);
}
- fireEvent(ureq, NodeEditController.NODECONFIG_CHANGED_EVENT);
- }
-
- if(source == chooseForm){
- if(event.getCommand().equals("cancel")){
+ cleanUp();
+ } else if(source == chooseForm) {
+ if(Event.CANCELLED_EVENT == event){
cmc.deactivate();
- }else{
+ } else if(event instanceof SelectFolderEvent) {
cmc.deactivate();
- String subpath = event.getCommand();
+
+ SelectFolderEvent sfe = (SelectFolderEvent)event;
+ String subpath = sfe.getSubpath();
subPath.setValue(subpath);
VFSContainer selectedContainer = (VFSContainer) course.getCourseFolderContainer().resolve(subpath);
@@ -218,19 +225,25 @@ public class BCCourseNodeEditForm extends FormBasicController implements Control
node.getModuleConfiguration().setStringValue(BCCourseNodeEditController.CONFIG_SUBPATH, subpath);
fireEvent(ureq, NodeEditController.NODECONFIG_CHANGED_EVENT);
}
+
if(node.isSharedFolder()){
sharedFolderInfo.setVisible(true);
- }else{
+ } else {
sharedFolderInfo.setVisible(false);
}
-
+ cleanUp();
+ } else if(cmc == source) {
+ cleanUp();
}
}
-
- @Override
- public void event(UserRequest ureq, Component source, Event event) {
-
- super.event(ureq, source, event);
+
+ private void cleanUp() {
+ removeAsListenerAndDispose(createFolderForm);
+ removeAsListenerAndDispose(chooseForm);
+ removeAsListenerAndDispose(cmc);
+ createFolderForm = null;
+ chooseForm = null;
+ cmc = null;
}
private void updatePublisher(VFSContainer container){
@@ -255,7 +268,7 @@ public class BCCourseNodeEditForm extends FormBasicController implements Control
}
private boolean isSharedfolderNotPresent(){
- if(node.getModuleConfiguration().getStringValue(BCCourseNodeEditController.CONFIG_SUBPATH).startsWith("/_sharedfolder")){
+ if(node.getModuleConfiguration().getStringValue(BCCourseNodeEditController.CONFIG_SUBPATH, "").startsWith("/_sharedfolder")){
if(course.getCourseEnvironment().getCourseFolderContainer().resolve("/_sharedfolder/") == null){
return true;
}
diff --git a/src/main/java/org/olat/course/nodes/bc/BCCourseNodeRunController.java b/src/main/java/org/olat/course/nodes/bc/BCCourseNodeRunController.java
index fbc1f481fd038542360a1806fef0056b568b740f..1ce8412c60f51ba9609f88128ca7cad3755f5919 100644
--- a/src/main/java/org/olat/course/nodes/bc/BCCourseNodeRunController.java
+++ b/src/main/java/org/olat/course/nodes/bc/BCCourseNodeRunController.java
@@ -95,8 +95,9 @@ public class BCCourseNodeRunController extends DefaultController implements Acti
target = BCCourseNode.getNodeFolderContainer(courseNode, courseEnv);
scallback = new FolderNodeCallback(BCCourseNode.getNodeFolderContainer(courseNode, courseEnv).getRelPath(), ne, isOlatAdmin, isGuestOnly, nodefolderSubContext);
- } else if(courseNode.isSharedFolder()){
- VFSItem item = courseEnv.getCourseFolderContainer().resolve(courseNode.getModuleConfiguration().getStringValue(BCCourseNodeEditController.CONFIG_SUBPATH));
+ } else if(courseNode.isSharedFolder()) {
+ String subpath = courseNode.getModuleConfiguration().getStringValue(BCCourseNodeEditController.CONFIG_SUBPATH, "");
+ VFSItem item = courseEnv.getCourseFolderContainer().resolve(subpath);
if(item == null){
noFolder = true;
BCCourseNodeNoFolderForm noFolderForm = new BCCourseNodeNoFolderForm(ureq, getWindowControl());
@@ -107,54 +108,53 @@ public class BCCourseNodeRunController extends DefaultController implements Acti
scallback = new FolderNodeReadOnlyCallback(nodefolderSubContext);
} else{
//create folder automatically if not found
- VFSContainer item = VFSManager.resolveOrCreateContainerFromPath(courseEnv.getCourseFolderContainer(), courseNode.getModuleConfiguration().getStringValue(BCCourseNodeEditController.CONFIG_SUBPATH));
+ String subPath = courseNode.getModuleConfiguration().getStringValue(BCCourseNodeEditController.CONFIG_SUBPATH);
+ VFSContainer item = VFSManager.resolveOrCreateContainerFromPath(courseEnv.getCourseFolderContainer(), subPath);
if(item == null){
noFolder = true;
BCCourseNodeNoFolderForm noFolderForm = new BCCourseNodeNoFolderForm(ureq, getWindowControl());
setInitialComponent(noFolderForm.getInitialComponent());
- }else {
- target = new NamedContainerImpl(courseNode.getShortTitle(), item);;
+ } else {
+ target = new NamedContainerImpl(courseNode.getShortTitle(), item);
}
scallback = new FolderNodeCallback(VFSManager.getRelativeItemPath(target, courseEnv.getCourseFolderContainer(), null), ne, isOlatAdmin, isGuestOnly, nodefolderSubContext);
}
- if(!noFolder){
- target.setLocalSecurityCallback(scallback);
-
-
- VFSContainer courseContainer = null;
- if(scallback.canWrite() && scallback.canCopy()) {
- Identity identity = ureq.getIdentity();
- ICourse course = CourseFactory.loadCourse(courseEnv.getCourseResourceableId());
- RepositoryManager rm = RepositoryManager.getInstance();
- RepositoryEntry entry = rm.lookupRepositoryEntry(course, true);
- if (isOlatAdmin || rm.isOwnerOfRepositoryEntry(identity, entry)
- || courseEnv.getCourseGroupManager().hasRight(identity, CourseRights.RIGHT_COURSEEDITOR)) {
- // use course folder as copy source
- courseContainer = courseEnv.getCourseFolderContainer();
+ if(!noFolder) {
+ target.setLocalSecurityCallback(scallback);
+
+ VFSContainer courseContainer = null;
+ if(scallback.canWrite() && scallback.canCopy()) {
+ Identity identity = ureq.getIdentity();
+ ICourse course = CourseFactory.loadCourse(courseEnv.getCourseResourceableId());
+ RepositoryManager rm = RepositoryManager.getInstance();
+ RepositoryEntry entry = rm.lookupRepositoryEntry(course, true);
+ if (isOlatAdmin || rm.isOwnerOfRepositoryEntry(identity, entry)
+ || courseEnv.getCourseGroupManager().hasRight(identity, CourseRights.RIGHT_COURSEEDITOR)) {
+ // use course folder as copy source
+ courseContainer = courseEnv.getCourseFolderContainer();
+ }
}
- }
-
- OlatNamedContainerImpl olatNamed;
- if(!courseNode.isSharedFolder()){
- String realPath = VFSManager.getRealPath(target);
- String relPath = StringUtils.difference(FolderConfig.getCanonicalRoot(), realPath);
-
- OlatRootFolderImpl olatRel = new OlatRootFolderImpl(relPath, null);
- olatNamed = new OlatNamedContainerImpl(target.getName(), olatRel);
- olatNamed.setLocalSecurityCallback(scallback);
- }else{
- String realPath = VFSManager.getRealPath(((NamedContainerImpl)target).getDelegate());
-
- String relPath = StringUtils.difference(FolderConfig.getCanonicalRoot(), realPath);
-
- OlatRootFolderImpl olatRel = new OlatRootFolderImpl(relPath, null);
- olatNamed = new OlatNamedContainerImpl(target.getName(), olatRel);
- olatNamed.setLocalSecurityCallback(scallback);
- }
-
- frc = new FolderRunController(olatNamed, true, true, true, ureq, getWindowControl(), null, null, courseContainer);
- setInitialComponent(frc.getInitialComponent());
+
+ OlatNamedContainerImpl olatNamed;
+ if(!courseNode.isSharedFolder()){
+ String realPath = VFSManager.getRealPath(target);
+ String relPath = StringUtils.difference(FolderConfig.getCanonicalRoot(), realPath);
+
+ OlatRootFolderImpl olatRel = new OlatRootFolderImpl(relPath, null);
+ olatNamed = new OlatNamedContainerImpl(target.getName(), olatRel);
+ olatNamed.setLocalSecurityCallback(scallback);
+ }else{
+ String realPath = VFSManager.getRealPath(((NamedContainerImpl)target).getDelegate());
+ String relPath = StringUtils.difference(FolderConfig.getCanonicalRoot(), realPath);
+
+ OlatRootFolderImpl olatRel = new OlatRootFolderImpl(relPath, null);
+ olatNamed = new OlatNamedContainerImpl(target.getName(), olatRel);
+ olatNamed.setLocalSecurityCallback(scallback);
+ }
+
+ frc = new FolderRunController(olatNamed, true, true, true, ureq, getWindowControl(), null, null, courseContainer);
+ setInitialComponent(frc.getInitialComponent());
}
}
diff --git a/src/main/java/org/olat/course/nodes/bc/SelectFolderEvent.java b/src/main/java/org/olat/course/nodes/bc/SelectFolderEvent.java
new file mode 100644
index 0000000000000000000000000000000000000000..33ca43459d331643e15127abc1ee2ae65eccfef5
--- /dev/null
+++ b/src/main/java/org/olat/course/nodes/bc/SelectFolderEvent.java
@@ -0,0 +1,43 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.course.nodes.bc;
+
+import org.olat.core.gui.control.Event;
+
+/**
+ *
+ * Initial date: 26.01.2016<br>
+ * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ *
+ */
+public class SelectFolderEvent extends Event {
+
+ private static final long serialVersionUID = -181496177465081875L;
+ private String subpath;
+
+ public SelectFolderEvent(String subpath) {
+ super("select-folder");
+ this.subpath = subpath;
+ }
+
+ public String getSubpath() {
+ return subpath;
+ }
+}
diff --git a/src/main/java/org/olat/course/nodes/bc/_content/chooseFolder.html b/src/main/java/org/olat/course/nodes/bc/_content/chooseFolder.html
index deee616726471b34b9b360f32b3902b62023bf42..167f5879085bb37afeadb2650ca6756bcb474325 100644
--- a/src/main/java/org/olat/course/nodes/bc/_content/chooseFolder.html
+++ b/src/main/java/org/olat/course/nodes/bc/_content/chooseFolder.html
@@ -1,3 +1,2 @@
$r.render("selectionTree")
-$r.render("chooseFolder")
-$r.render("cancel")
\ No newline at end of file
+<div class="o_button_group">$r.render("chooseFolder") $r.render("cancel")</div>
diff --git a/src/main/java/org/olat/course/nodes/en/ENEditController.java b/src/main/java/org/olat/course/nodes/en/ENEditController.java
index 45647be146f18b831ceae61c5ab8e7db2f9ad71d..0e42312af2edb29db5d4f7522e341e3792d06f39 100644
--- a/src/main/java/org/olat/course/nodes/en/ENEditController.java
+++ b/src/main/java/org/olat/course/nodes/en/ENEditController.java
@@ -25,6 +25,8 @@
package org.olat.course.nodes.en;
+import java.util.List;
+
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.tabbedpane.TabbedPane;
@@ -34,6 +36,7 @@ import org.olat.core.gui.control.ControllerEventListener;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
import org.olat.core.gui.control.generic.tabbable.ActivateableTabbableDefaultController;
+import org.olat.core.util.StringHelper;
import org.olat.course.ICourse;
import org.olat.course.assessment.AssessmentHelper;
import org.olat.course.condition.Condition;
@@ -156,7 +159,12 @@ public class ENEditController extends ActivateableTabbableDefaultController impl
* @return true if module configuration is valid
*/
public static boolean isConfigValid(ModuleConfiguration moduleConfiguration) {
- return (moduleConfiguration.get(ENCourseNode.CONFIG_GROUPNAME) != null);
+ String groupNames = (String)moduleConfiguration.get(ENCourseNode.CONFIG_GROUPNAME);
+ String areaNames = (String)moduleConfiguration.get(ENCourseNode.CONFIG_AREANAME);
+ List<Long> groupKeys = moduleConfiguration.getList(ENCourseNode.CONFIG_GROUP_IDS, Long.class);
+ List<Long> areaKeys = moduleConfiguration.getList(ENCourseNode.CONFIG_AREA_IDS, Long.class);
+ return StringHelper.containsNonWhitespace(groupNames) || StringHelper.containsNonWhitespace(areaNames)
+ || (groupKeys != null && groupKeys.size() > 0) || (areaKeys != null && areaKeys.size() > 0);
}
public String[] getPaneKeys() {
diff --git a/src/main/java/org/olat/modules/fo/ForumChangedEvent.java b/src/main/java/org/olat/modules/fo/ForumChangedEvent.java
index 1cb2fa3436453985860f89a2d8c3fe4ccf11e811..c3a93007e956b01e0303aaae05a8cae6a1c16bbe 100644
--- a/src/main/java/org/olat/modules/fo/ForumChangedEvent.java
+++ b/src/main/java/org/olat/modules/fo/ForumChangedEvent.java
@@ -50,6 +50,8 @@ public class ForumChangedEvent extends MultiUserEvent {
public static final String STICKY = "sticky";
public static final String NEW_MESSAGE = "new-message";
public static final String CHANGED_MESSAGE = "changed-message";
+ public static final String DELETED_MESSAGE = "deleted-message";
+ public static final String DELETED_THREAD = "deleted-thread";
private Long threadtopKey;
private Long messageKey;
diff --git a/src/main/java/org/olat/modules/fo/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/fo/_i18n/LocalStrings_de.properties
index 204ddbf18d35a6f22c3a2f9c03e1fbfe0b7dd9c4..d6e1a23dc4bc563737ea1e4acc55f75e13f3f06d 100644
--- a/src/main/java/org/olat/modules/fo/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/fo/_i18n/LocalStrings_de.properties
@@ -24,6 +24,7 @@ attachments.remove.string=l
close.thread=Diskussion beenden
delete.att.ok=Die Datei wurde gel\u00F6scht.
deleteok=Der Beitrag wurde gel\u00F6scht
+error.message.deleted=$\:deleteok
error.field.not.empty=Dieses Feld darf nicht leer sein.
error.pseudonym=Zu grosse \u00C4hnlichkeit zu bereits bestehendem Benutzer
filter=Personenfilter
diff --git a/src/main/java/org/olat/modules/fo/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/fo/_i18n/LocalStrings_en.properties
index fa2d2db2ce9c168a528717c8dffb70d00b58531a..b38da77786eeadc2b8c14a07bc5e22f601d0a44b 100644
--- a/src/main/java/org/olat/modules/fo/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/fo/_i18n/LocalStrings_en.properties
@@ -22,6 +22,7 @@ attachments.upload.successful=File {0} successfully uploaded. Other files can st
close.thread=Close discussion
delete.att.ok=File deleted.
deleteok=This post has been deleted.
+error.message.deleted=$\:deleteok
error.field.not.empty=This field is mandatory.
error.pseudonym=This name is too similar to an already existing user.
filter=Filter for persons
diff --git a/src/main/java/org/olat/modules/fo/manager/ForumManager.java b/src/main/java/org/olat/modules/fo/manager/ForumManager.java
index f1353a6da19eb9e1e98a1818bdfc76a6a80afe67..c3703fe12dda2366a6895b0196281bc1dc88b6b3 100644
--- a/src/main/java/org/olat/modules/fo/manager/ForumManager.java
+++ b/src/main/java/org/olat/modules/fo/manager/ForumManager.java
@@ -301,11 +301,11 @@ public class ForumManager {
for(Object[] object:objects) {
Message msg = (Message)object[0];
Number numOfMessagesLong = (Number)object[1];
- Date lastModifed = (Date)object[2];
+ Date lastModified = (Date)object[2];
int numOfMessages = numOfMessagesLong == null ? 1 : numOfMessagesLong.intValue() + 1;
String creator = userManager.getUserDisplayName(msg.getCreator());
- ForumThread thread = new ForumThread(msg, creator, lastModifed, numOfMessages);
-
+ ForumThread thread = new ForumThread(msg, creator, lastModified, numOfMessages);
+
if(identity != null) {
Number readMessages = (Number)object[3];
int numOfReadMessages = readMessages == null ? 0 : readMessages.intValue();
diff --git a/src/main/java/org/olat/modules/fo/model/ForumThread.java b/src/main/java/org/olat/modules/fo/model/ForumThread.java
index bdc198ea6a5c26725401711ba8f4670234fd8cd8..8e0e39c70de6ffcc5bfea2ee19cf5da3ad8512fb 100644
--- a/src/main/java/org/olat/modules/fo/model/ForumThread.java
+++ b/src/main/java/org/olat/modules/fo/model/ForumThread.java
@@ -49,7 +49,7 @@ public class ForumThread implements MessageRef {
this.key = message.getKey();
this.type = message.getStatusCode();
this.title = message.getTitle();
- if(lastModified == null || lastModified.after(message.getLastModified())) {
+ if(lastModified == null || lastModified.before(message.getLastModified())) {
this.lastModified = message.getLastModified();
} else {
this.lastModified = lastModified;
diff --git a/src/main/java/org/olat/modules/fo/ui/ForumController.java b/src/main/java/org/olat/modules/fo/ui/ForumController.java
index 3852201b0fa43b1cb246352167ae4ff5ca67b3d2..867f17f5ef0ddadd4be22768f32027be632331ff 100644
--- a/src/main/java/org/olat/modules/fo/ui/ForumController.java
+++ b/src/main/java/org/olat/modules/fo/ui/ForumController.java
@@ -51,6 +51,8 @@ import org.olat.modules.fo.ForumChangedEvent;
import org.olat.modules.fo.Message;
import org.olat.modules.fo.Status;
import org.olat.modules.fo.manager.ForumManager;
+import org.olat.modules.fo.ui.events.DeleteMessageEvent;
+import org.olat.modules.fo.ui.events.DeleteThreadEvent;
import org.olat.modules.fo.ui.events.SelectMessageEvent;
import org.olat.modules.fo.ui.events.SelectUserEvent;
import org.olat.modules.fo.ui.events.SelectUserListEvent;
@@ -207,6 +209,11 @@ public class ForumController extends BasicController implements GenericEventList
} else if(viewCtrl == source) {
if(event == Event.BACK_EVENT) {
doThreadList(ureq);
+ } else if(event instanceof DeleteThreadEvent) {
+ reloadThreadList = true;
+ doThreadList(ureq);
+ } else if(event instanceof DeleteMessageEvent) {
+ reloadThreadList = true;
} else if(event instanceof SelectMessageEvent) {
doProcessSelectEvent(ureq, (SelectMessageEvent)event);
}
diff --git a/src/main/java/org/olat/modules/fo/ui/MessageListController.java b/src/main/java/org/olat/modules/fo/ui/MessageListController.java
index 98e4e4690d720b284ed921e3f2ff79858b18ff93..48ffe04f6d3831efae839c3772074e40eec7ba63 100644
--- a/src/main/java/org/olat/modules/fo/ui/MessageListController.java
+++ b/src/main/java/org/olat/modules/fo/ui/MessageListController.java
@@ -49,6 +49,7 @@ import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
import org.olat.core.gui.control.controller.BasicController;
import org.olat.core.gui.control.generic.closablewrapper.CloseableModalController;
+import org.olat.core.gui.control.generic.dtabs.Activateable2;
import org.olat.core.gui.control.generic.modal.DialogBoxController;
import org.olat.core.gui.control.generic.modal.DialogBoxUIFactory;
import org.olat.core.gui.media.MediaResource;
@@ -58,6 +59,8 @@ import org.olat.core.id.OLATResourceable;
import org.olat.core.id.User;
import org.olat.core.id.UserConstants;
import org.olat.core.id.context.BusinessControlFactory;
+import org.olat.core.id.context.ContextEntry;
+import org.olat.core.id.context.StateEntry;
import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
import org.olat.core.util.ConsumableBoolean;
import org.olat.core.util.Formatter;
@@ -83,6 +86,8 @@ import org.olat.modules.fo.Status;
import org.olat.modules.fo.archiver.formatters.ForumDownloadResource;
import org.olat.modules.fo.manager.ForumManager;
import org.olat.modules.fo.ui.MessageEditController.EditMode;
+import org.olat.modules.fo.ui.events.DeleteMessageEvent;
+import org.olat.modules.fo.ui.events.DeleteThreadEvent;
import org.olat.modules.fo.ui.events.SelectMessageEvent;
import org.olat.portfolio.EPUIFactory;
import org.olat.portfolio.manager.EPFrontendManager;
@@ -100,7 +105,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class MessageListController extends BasicController implements GenericEventListener {
+public class MessageListController extends BasicController implements GenericEventListener, Activateable2 {
protected static final String USER_PROPS_ID = ForumUserListController.class.getCanonicalName();
@@ -260,7 +265,14 @@ public class MessageListController extends BasicController implements GenericEve
reloadList = false;
if(loadMode == LoadMode.thread) {
loadThread(ureq, thread);
- scrollTo(message);
+ String settings = doShowBySettings(ureq);
+ if(VIEWMODE_MESSAGE.equals(settings)) {
+ if(message != null && message.getKey() != null) {
+ doSelectTheOne(ureq, message.getKey());
+ }
+ } else {
+ scrollTo(message);
+ }
} else if(message != null) {
MessageView view = loadView(ureq, message);
backupViews.add(view);
@@ -282,6 +294,7 @@ public class MessageListController extends BasicController implements GenericEve
private void reloadModelAfterDelete(UserRequest ureq, MessageView message) {
if(loadMode == LoadMode.thread) {
loadThread(ureq, thread);
+ doShowBySettings(ureq);
} else if(message != null) {
for(MessageView msg:backupViews) {
if(msg.getKey().equals(message.getKey())) {
@@ -621,11 +634,18 @@ public class MessageListController extends BasicController implements GenericEve
}
}
+ @Override
+ public void activate(UserRequest ureq, List<ContextEntry> entries, StateEntry state) {
+ //
+ }
+
@Override
public void event(Event event) {
if(event instanceof ForumChangedEvent) {
ForumChangedEvent fce = (ForumChangedEvent)event;
- if(ForumChangedEvent.CHANGED_MESSAGE.equals(fce.getCommand()) || ForumChangedEvent.NEW_MESSAGE.equals(fce.getCommand())) {
+ if(ForumChangedEvent.CHANGED_MESSAGE.equals(fce.getCommand())
+ || ForumChangedEvent.NEW_MESSAGE.equals(fce.getCommand())
+ || ForumChangedEvent.DELETED_MESSAGE.equals(fce.getCommand()) ) {
Long threadtopKey = fce.getThreadtopKey();
Long senderId = fce.getSendByIdentityKey();
if(thread != null && threadtopKey != null && thread.getKey().equals(threadtopKey)
@@ -723,13 +743,16 @@ public class MessageListController extends BasicController implements GenericEve
if (source == confirmDeleteCtrl) {
if (DialogBoxUIFactory.isYesEvent(event) || DialogBoxUIFactory.isOkEvent(event)) {
MessageView deletedMessage = (MessageView)confirmDeleteCtrl.getUserObject();
- doDeleteMessage(deletedMessage);
- reloadModelAfterDelete(ureq, deletedMessage);
+ doDeleteMessage(ureq, deletedMessage);
+
}
} else if(editMessageCtrl == source) {
// edit done -> save
Message message = editMessageCtrl.getMessage();
if(message != null) {
+ if(thread != null && thread.getKey().equals(message.getKey())) {
+ thread = message;
+ }
reloadModel(ureq, message);
} else {
showInfo("header.cannoteditmessage");
@@ -856,22 +879,39 @@ public class MessageListController extends BasicController implements GenericEve
}
}
- private void doDeleteMessage(MessageView message) {
+ private void doDeleteMessage(UserRequest ureq, MessageView message) {
boolean userIsMsgCreator = message.isAuthor();
if (foCallback.mayDeleteMessageAsModerator()
|| (userIsMsgCreator && forumManager.countMessageChildren(message.getKey()) == 0)) {
Message reloadedMessage = forumManager.getMessageById(message.getKey());
+
+
if(reloadedMessage != null) {
- boolean hasParent = reloadedMessage.getParent() != null;
- forumManager.deleteMessageTree(forum.getKey(), reloadedMessage);
- showInfo("deleteok");
- // do logging
- if(hasParent) {
+ //this delete the topic / thread
+ if(reloadedMessage.getParent() == null) {
+ forumManager.deleteMessageTree(forum.getKey(), reloadedMessage);
+ //delete topics
ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_MESSAGE_DELETE, getClass(),
LoggingResourceable.wrap(reloadedMessage));
+ //back to thread list
+ fireEvent(ureq, new DeleteThreadEvent());
+ ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.DELETED_THREAD, reloadedMessage.getKey(), reloadedMessage.getKey(), getIdentity());
+ CoordinatorManager.getInstance().getCoordinator().getEventBus().fireEventToListenersOf(event, forum);
} else {
+ Message threadTop = reloadedMessage.getThreadtop();
+ forumManager.deleteMessageTree(forum.getKey(), reloadedMessage);
+ threadTop = forumManager.updateMessage(threadTop, true);
+ if(thread != null) {
+ thread = threadTop;//update with the fresh version
+ }
+ showInfo("deleteok");
ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_THREAD_DELETE, getClass(),
- LoggingResourceable.wrap(reloadedMessage));
+ LoggingResourceable.wrap(reloadedMessage));
+ //reload
+ reloadModelAfterDelete(ureq, message);
+ fireEvent(ureq, new DeleteMessageEvent());
+ ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.DELETED_MESSAGE, threadTop.getKey(), message.getKey(), getIdentity());
+ CoordinatorManager.getInstance().getCoordinator().getEventBus().fireEventToListenersOf(event, forum);
}
}
} else {
@@ -885,13 +925,18 @@ public class MessageListController extends BasicController implements GenericEve
boolean children = forumManager.countMessageChildren(message.getKey()) > 0;
if (foCallback.mayEditMessageAsModerator() || (userIsMsgCreator && !children)) {
Message reloadedMessage = forumManager.loadMessage(message.getKey());
- editMessageCtrl = new MessageEditController(ureq, getWindowControl(), forum, foCallback, reloadedMessage, null, EditMode.edit);
- listenTo(editMessageCtrl);
-
- String title = translate("msg.update");
- cmc = new CloseableModalController(getWindowControl(), "close", editMessageCtrl.getInitialComponent(), true, title);
- listenTo(editMessageCtrl);
- cmc.activate();
+ if(reloadedMessage == null) {
+ showWarning("error.message.deleted");
+ reloadModel(ureq, null);
+ } else {
+ editMessageCtrl = new MessageEditController(ureq, getWindowControl(), forum, foCallback, reloadedMessage, null, EditMode.edit);
+ listenTo(editMessageCtrl);
+
+ String title = translate("msg.update");
+ cmc = new CloseableModalController(getWindowControl(), "close", editMessageCtrl.getInitialComponent(), true, title);
+ listenTo(editMessageCtrl);
+ cmc.activate();
+ }
} else if ((userIsMsgCreator) && (children == true)) {
// user is author of the current message but it has already at least
// one child
@@ -1045,7 +1090,7 @@ public class MessageListController extends BasicController implements GenericEve
}
}
- protected void doShowBySettings(UserRequest ureq) {
+ protected String doShowBySettings(UserRequest ureq) {
String viewSettings = getViewSettings(ureq);
switch(viewSettings) {
case VIEWMODE_THREAD: doShowAll(ureq); break;
@@ -1053,6 +1098,7 @@ public class MessageListController extends BasicController implements GenericEve
case VIEWMODE_MESSAGE: doShowOne(ureq); break;
default: doShowAll(ureq);
}
+ return viewSettings == null ? VIEWMODE_THREAD : viewSettings;
}
private void doShowAll(UserRequest ureq) {
diff --git a/src/main/java/org/olat/modules/fo/ui/ThreadListController.java b/src/main/java/org/olat/modules/fo/ui/ThreadListController.java
index 8bc4c0a1f84b02b680defe68afba6ff9acc65a25..53d32a7de2dd85a48645abd171d79c75321bc437 100644
--- a/src/main/java/org/olat/modules/fo/ui/ThreadListController.java
+++ b/src/main/java/org/olat/modules/fo/ui/ThreadListController.java
@@ -31,6 +31,7 @@ import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.form.flexible.FormItem;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
import org.olat.core.gui.components.form.flexible.elements.FlexiTableElement;
+import org.olat.core.gui.components.form.flexible.elements.FlexiTableSortOptions;
import org.olat.core.gui.components.form.flexible.elements.FormLink;
import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
import org.olat.core.gui.components.form.flexible.impl.FormEvent;
@@ -146,6 +147,10 @@ public class ThreadListController extends FormBasicController {
threadTable.setCustomizeColumns(false);
threadTable.setElementCssClass("o_forum");
threadTable.setEmtpyTableMessageKey("forum.emtpy");
+
+ FlexiTableSortOptions sortOptions = new FlexiTableSortOptions();
+ sortOptions.setDefaultOrderBy(new SortKey(ThreadListCols.lastModified.name(), false));
+ threadTable.setSortSettings(sortOptions);
}
@Override
diff --git a/src/main/java/org/olat/modules/fo/ui/events/DeleteMessageEvent.java b/src/main/java/org/olat/modules/fo/ui/events/DeleteMessageEvent.java
new file mode 100644
index 0000000000000000000000000000000000000000..d1e003781a45aafcd46b00327a6d0984b2c6b3bb
--- /dev/null
+++ b/src/main/java/org/olat/modules/fo/ui/events/DeleteMessageEvent.java
@@ -0,0 +1,38 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.modules.fo.ui.events;
+
+import org.olat.core.gui.control.Event;
+
+/**
+ *
+ * Initial date: 19.01.2016<br>
+ * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ *
+ */
+public class DeleteMessageEvent extends Event {
+
+ private static final long serialVersionUID = -8285874513631333312L;
+
+ public DeleteMessageEvent() {
+ super("delete-msg");
+ }
+
+}
diff --git a/src/main/java/org/olat/modules/fo/ui/events/DeleteThreadEvent.java b/src/main/java/org/olat/modules/fo/ui/events/DeleteThreadEvent.java
new file mode 100644
index 0000000000000000000000000000000000000000..29b7e4828ec73d546d9d7f282ceb8aa6c5915410
--- /dev/null
+++ b/src/main/java/org/olat/modules/fo/ui/events/DeleteThreadEvent.java
@@ -0,0 +1,38 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.modules.fo.ui.events;
+
+import org.olat.core.gui.control.Event;
+
+/**
+ *
+ * Initial date: 19.01.2016<br>
+ * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ *
+ */
+public class DeleteThreadEvent extends Event {
+
+ private static final long serialVersionUID = 5265692857928069834L;
+
+ public DeleteThreadEvent() {
+ super("delete-thread");
+ }
+
+}
diff --git a/src/main/java/org/olat/modules/qpool/manager/CollectionDAO.java b/src/main/java/org/olat/modules/qpool/manager/CollectionDAO.java
index 9b42155bf19df280f267873f5179a84db8c0d7ac..529869cd3154aeb994410119bc4b548f5501d352 100644
--- a/src/main/java/org/olat/modules/qpool/manager/CollectionDAO.java
+++ b/src/main/java/org/olat/modules/qpool/manager/CollectionDAO.java
@@ -21,7 +21,9 @@ package org.olat.modules.qpool.manager;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.persistence.TypedQuery;
@@ -84,12 +86,13 @@ public class CollectionDAO {
* @param collection
* @return true if the item is in the collection after the call
*/
- public boolean addItemToCollection(Long itemKey, List<QuestionItemCollection> collections) {
- QuestionItemImpl lockedItem = questionItemDao.loadForUpdate(itemKey);
+ public boolean addItemToCollection(QuestionItemShort item, List<QuestionItemCollection> collections) {
+ QuestionItemImpl lockedItem = questionItemDao.loadForUpdate(item);
if(lockedItem == null) {
return false;
}
- for(QuestionItemCollection collection:collections) {
+ Set<QuestionItemCollection> uniqueCollections = new HashSet<>(collections);
+ for(QuestionItemCollection collection:uniqueCollections) {
if(!isInCollection(collection, lockedItem)) {
CollectionToItem coll2Item = new CollectionToItem();
coll2Item.setCreationDate(new Date());
diff --git a/src/main/java/org/olat/modules/qpool/manager/PoolDAO.java b/src/main/java/org/olat/modules/qpool/manager/PoolDAO.java
index aa79d53935e63d07e89adce7e2991744a55d5ef4..4b6b890e4cfcb044f47e20fab70b5ca3ce53d68c 100644
--- a/src/main/java/org/olat/modules/qpool/manager/PoolDAO.java
+++ b/src/main/java/org/olat/modules/qpool/manager/PoolDAO.java
@@ -207,7 +207,7 @@ public class PoolDAO {
}
public void addItemToPool(QuestionItemShort item, List<Pool> pools, boolean editable) {
- QuestionItem lockedItem = questionItemDao.loadForUpdate(item.getKey());
+ QuestionItem lockedItem = questionItemDao.loadForUpdate(item);
for(Pool pool:pools) {
if(!isInPool(lockedItem, pool)) {
PoolToItem p2i = new PoolToItem();
diff --git a/src/main/java/org/olat/modules/qpool/manager/QuestionItemDAO.java b/src/main/java/org/olat/modules/qpool/manager/QuestionItemDAO.java
index c36a4e9c6fe09ec1fdeee3054fc5377640359696..3a021fdfb3be632c6469f7bcd22b965f48daeb22 100644
--- a/src/main/java/org/olat/modules/qpool/manager/QuestionItemDAO.java
+++ b/src/main/java/org/olat/modules/qpool/manager/QuestionItemDAO.java
@@ -161,8 +161,8 @@ public class QuestionItemDAO {
return (QuestionItemImpl)dbInstance.getCurrentEntityManager().merge(item);
}
- public void addAuthors(List<Identity> authors, Long itemKey) {
- QuestionItemImpl lockedItem = loadForUpdate(itemKey);
+ public void addAuthors(List<Identity> authors, QuestionItemShort item) {
+ QuestionItemImpl lockedItem = loadForUpdate(item);
SecurityGroup secGroup = lockedItem.getOwnerGroup();
for(Identity author:authors) {
if(!securityManager.isIdentityInSecurityGroup(author, secGroup)) {
@@ -172,8 +172,8 @@ public class QuestionItemDAO {
dbInstance.commit();
}
- public void removeAuthors(List<Identity> authors, Long itemKey) {
- QuestionItemImpl lockedItem = loadForUpdate(itemKey);
+ public void removeAuthors(List<Identity> authors, QuestionItemShort item) {
+ QuestionItemImpl lockedItem = loadForUpdate(item);
SecurityGroup secGroup = lockedItem.getOwnerGroup();
for(Identity author:authors) {
if(securityManager.isIdentityInSecurityGroup(author, secGroup)) {
@@ -259,15 +259,15 @@ public class QuestionItemDAO {
return items;
}
- public QuestionItemImpl loadForUpdate(Long key) {
+ public QuestionItemImpl loadForUpdate(QuestionItemShort item) {
StringBuilder sb = new StringBuilder();
sb.append("select item from questionitem item where item.key=:key");
- QuestionItemImpl item = dbInstance.getCurrentEntityManager()
+ QuestionItemImpl lockedItem = dbInstance.getCurrentEntityManager()
.createQuery(sb.toString(), QuestionItemImpl.class)
- .setParameter("key", key)
+ .setParameter("key", item.getKey())
.setLockMode(LockModeType.PESSIMISTIC_WRITE)
.getSingleResult();
- return item;
+ return lockedItem;
}
public int getNumOfQuestions() {
@@ -289,7 +289,7 @@ public class QuestionItemDAO {
}
public void share(QuestionItem item, OLATResource resource) {
- QuestionItem lockedItem = loadForUpdate(item.getKey());
+ QuestionItem lockedItem = loadForUpdate(item);
if(!isShared(item, resource)) {
EntityManager em = dbInstance.getCurrentEntityManager();
ResourceShareImpl share = new ResourceShareImpl();
@@ -301,9 +301,9 @@ public class QuestionItemDAO {
dbInstance.commit();//release the lock asap
}
- public void share(Long itemKey, List<OLATResource> resources, boolean editable) {
+ public void share(QuestionItemShort item, List<OLATResource> resources, boolean editable) {
EntityManager em = dbInstance.getCurrentEntityManager();
- QuestionItem lockedItem = loadForUpdate(itemKey);
+ QuestionItem lockedItem = loadForUpdate(item);
for(OLATResource resource:resources) {
if(!isShared(lockedItem, resource)) {
ResourceShareImpl share = new ResourceShareImpl();
diff --git a/src/main/java/org/olat/modules/qpool/manager/QuestionPoolServiceImpl.java b/src/main/java/org/olat/modules/qpool/manager/QuestionPoolServiceImpl.java
index 864c9f67ec5d212c5c7336022fb4d72b2d512dc4..363d451201e4ceb9997b6ae8d6c45e6d565ea551 100644
--- a/src/main/java/org/olat/modules/qpool/manager/QuestionPoolServiceImpl.java
+++ b/src/main/java/org/olat/modules/qpool/manager/QuestionPoolServiceImpl.java
@@ -149,7 +149,7 @@ public class QuestionPoolServiceImpl implements QPoolService {
}
for(QuestionItemShort item:items) {
- questionItemDao.addAuthors(authors, item.getKey());
+ questionItemDao.addAuthors(authors, item);
}
}
@@ -160,7 +160,7 @@ public class QuestionPoolServiceImpl implements QPoolService {
}
for(QuestionItemShort item:items) {
- questionItemDao.removeAuthors(authors, item.getKey());
+ questionItemDao.removeAuthors(authors, item);
}
}
@@ -537,7 +537,7 @@ public class QuestionPoolServiceImpl implements QPoolService {
}
for(QuestionItemShort item:items) {
- questionItemDao.share(item.getKey(), resources, editable);
+ questionItemDao.share(item, resources, editable);
}
}
@@ -595,7 +595,7 @@ public class QuestionPoolServiceImpl implements QPoolService {
QuestionItemCollection coll = collectionDao.createCollection(collectionName, owner);
List<Long> keys = new ArrayList<>(initialItems.size());
for(QuestionItemShort item:initialItems) {
- collectionDao.addItemToCollection(item.getKey(), Collections.singletonList(coll));
+ collectionDao.addItemToCollection(item, Collections.singletonList(coll));
keys.add(item.getKey());
}
lifeIndexer.indexDocument(QItemDocument.TYPE, keys);
@@ -616,7 +616,7 @@ public class QuestionPoolServiceImpl implements QPoolService {
public void addItemToCollection(List<? extends QuestionItemShort> items, List<QuestionItemCollection> collections) {
List<Long> keys = new ArrayList<>(items.size());
for(QuestionItemShort item:items) {
- collectionDao.addItemToCollection(item.getKey(), collections);
+ collectionDao.addItemToCollection(item, collections);
keys.add(item.getKey());
}
lifeIndexer.indexDocument(QItemDocument.TYPE, keys);
diff --git a/src/main/java/org/olat/modules/vitero/restapi/ViteroBookingWebService.java b/src/main/java/org/olat/modules/vitero/restapi/ViteroBookingWebService.java
index 886af02ca8da46fbc0aa3a9d60b9c5d1cb001512..5fff7c2126b77392663bed11c76318f51fded93d 100644
--- a/src/main/java/org/olat/modules/vitero/restapi/ViteroBookingWebService.java
+++ b/src/main/java/org/olat/modules/vitero/restapi/ViteroBookingWebService.java
@@ -47,6 +47,7 @@ import org.olat.core.util.Util;
import org.olat.modules.vitero.ViteroModule;
import org.olat.modules.vitero.manager.ViteroManager;
import org.olat.modules.vitero.manager.VmsNotAvailableException;
+import org.olat.modules.vitero.model.ErrorCode;
import org.olat.modules.vitero.model.GroupRole;
import org.olat.modules.vitero.model.ViteroBooking;
import org.olat.modules.vitero.model.ViteroGroupRoles;
@@ -325,6 +326,8 @@ public class ViteroBookingWebService {
}
private Response handleNotAvailableException() {
- return Response.serverError().status(Status.SERVICE_UNAVAILABLE).build();
+ ViteroStatus status = new ViteroStatus(ErrorCode.unkown);
+ ViteroErrorVO error = new ViteroErrorVO(status, "vitero server is probable not avalailable at this time");
+ return Response.serverError().entity(error).status(Status.SERVICE_UNAVAILABLE).build();
}
}
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/webFeed/models/Feed.java b/src/main/java/org/olat/modules/webFeed/models/Feed.java
index 8694990a54bde2a4966f7f6263d37d0283b2d2e9..3e5f543b466a94df3ad18162994dac1f9e745dd1 100644
--- a/src/main/java/org/olat/modules/webFeed/models/Feed.java
+++ b/src/main/java/org/olat/modules/webFeed/models/Feed.java
@@ -207,6 +207,17 @@ public class Feed implements OLATResourceable, Serializable {
public List<Item> getItems() {
return items;
}
+
+ /**
+ * Return a copy of the list of items, but the items
+ * are not copied. Use this method to mitigate concurrent
+ * modifications issues.
+ *
+ * @return
+ */
+ public List<Item> getCopiedListOfItems() {
+ return items == null ? null : new ArrayList<>(items);
+ }
/**
* @param identity
diff --git a/src/main/java/org/olat/modules/webFeed/ui/ItemsController.java b/src/main/java/org/olat/modules/webFeed/ui/ItemsController.java
index bc223221f073268fd15671afd1cdc0a1a30ef4b0..c25701fb2571455ed9b2133c805bd8ad7b07bf82 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/ItemsController.java
+++ b/src/main/java/org/olat/modules/webFeed/ui/ItemsController.java
@@ -216,7 +216,7 @@ public class ItemsController extends BasicController implements Activateable2 {
* @param feed the current feed object
*/
private void createEditButtons(UserRequest ureq, Feed feed) {
- List<Item> items = feed.getItems();
+ List<Item> items = feed.getCopiedListOfItems();
editButtons = new ArrayList<Link>();
deleteButtons = new ArrayList<Link>();
@@ -248,7 +248,7 @@ public class ItemsController extends BasicController implements Activateable2 {
* @param feed
*/
private void createCommentsAndRatingsLinks(UserRequest ureq, Feed feed) {
- List<Item> items = feed.getItems();
+ List<Item> items = feed.getCopiedListOfItems();
if (items != null) {
for (Item item : items) {
// Add rating and commenting controller
@@ -289,19 +289,19 @@ public class ItemsController extends BasicController implements Activateable2 {
* @param feed
*/
private void createDateComponents(Feed feed) {
- List<Item> items = feed.getItems();
+ List<Item> items = feed.getCopiedListOfItems();
if (items != null) {
for (Item item : items) {
- String guid = item.getGuid();
- if(item.getDate() != null) {
- DateComponentFactory.createDateComponentWithYear("date." + guid, item.getDate(), vcItems);
- }
+ String guid = item.getGuid();
+ if(item.getDate() != null) {
+ DateComponentFactory.createDateComponentWithYear("date." + guid, item.getDate(), vcItems);
+ }
}
}
}
private void createItemLinks(Feed feed) {
- List<Item> items = feed.getItems();
+ List<Item> items = feed.getCopiedListOfItems();
itemLinks = new ArrayList<Link>();
if (items != null) {
for (Item item : items) {
@@ -603,28 +603,39 @@ public class ItemsController extends BasicController implements Activateable2 {
if (!feed.getItems().contains(currentItem)) {
// Add the modified item if it is not part of the feed
feed = feedManager.addItem(currentItem, mediaFile, feed);
- createButtonsForItem(ureq, currentItem);
- createItemLink(currentItem);
- // Add date component
- String guid = currentItem.getGuid();
- if(currentItem.getDate() != null) {
- DateComponentFactory.createDateComponentWithYear("date." + guid, currentItem.getDate(), vcItems);
+ if(feed == null) {
+ //the item could not be added, is not internal
+ feed = feedManager.getFeed(feedResource);
+ if(!feed.isInternal() && !feed.isExternal() && !feed.hasItems()) {
+ feed = feedManager.updateFeedMode(Boolean.FALSE, feed);
+ feed = feedManager.addItem(currentItem, mediaFile, feed);
+ }
}
- // Add comments and rating
- createCommentsAndRatingsLink(ureq, feed, currentItem);
- // add it to the navigation controller
- naviCtr.add(currentItem);
- // ... and also to the helper
- helper.addItem(currentItem);
- if (feed.getItems() != null && feed.getItems().size() == 1) {
- // First item added, show feed url (for subscription)
- fireEvent(ureq, ItemsController.FEED_INFO_IS_DIRTY_EVENT);
- // Set the base URI of the feed for the current user. All users
- // have unique URIs.
- helper.setURIs();
+
+ if(feed != null) {
+ createButtonsForItem(ureq, currentItem);
+ createItemLink(currentItem);
+ // Add date component
+ String guid = currentItem.getGuid();
+ if(currentItem.getDate() != null) {
+ DateComponentFactory.createDateComponentWithYear("date." + guid, currentItem.getDate(), vcItems);
+ }
+ // Add comments and rating
+ createCommentsAndRatingsLink(ureq, feed, currentItem);
+ // add it to the navigation controller
+ naviCtr.add(currentItem);
+ // ... and also to the helper
+ helper.addItem(currentItem);
+ if (feed.getItems() != null && feed.getItems().size() == 1) {
+ // First item added, show feed url (for subscription)
+ fireEvent(ureq, ItemsController.FEED_INFO_IS_DIRTY_EVENT);
+ // Set the base URI of the feed for the current user. All users
+ // have unique URIs.
+ helper.setURIs();
+ }
+ // do logging
+ ThreadLocalUserActivityLogger.log(FeedLoggingAction.FEED_ITEM_CREATE, getClass(), LoggingResourceable.wrap(currentItem));
}
- // do logging
- ThreadLocalUserActivityLogger.log(FeedLoggingAction.FEED_ITEM_CREATE, getClass(), LoggingResourceable.wrap(currentItem));
} else {
// Write item file
feed = feedManager.updateItem(currentItem, mediaFile, feed);
@@ -700,7 +711,9 @@ public class ItemsController extends BasicController implements Activateable2 {
}
// Check if someone else added an item, reload everything
- if (!isSameAllItems(feed.getFilteredItems(callback, ureq.getIdentity()))) {
+ if (feed == null) {
+ //do something
+ } else if(!isSameAllItems(feed.getFilteredItems(callback, getIdentity()))) {
resetItems(ureq, feed);
}
}
diff --git a/src/main/java/org/olat/repository/RepositoryMailing.java b/src/main/java/org/olat/repository/RepositoryMailing.java
index 3f8ba50f1f729592c210f2100b07f2e6f9876737..39f8ac3f222f21720fde343e6bc3a62e13b6e313 100644
--- a/src/main/java/org/olat/repository/RepositoryMailing.java
+++ b/src/main/java/org/olat/repository/RepositoryMailing.java
@@ -119,6 +119,12 @@ public class RepositoryMailing {
return;
}
+ String email = identity.getUser().getProperty(UserConstants.EMAIL, null);
+ String emailAlt = identity.getUser().getProperty(UserConstants.INSTITUTIONALEMAIL, null);
+ if(!StringHelper.containsNonWhitespace(email) && !StringHelper.containsNonWhitespace(emailAlt)) {
+ return;
+ }
+
if(mailing == null) {
BaseSecurity securityManager = CoreSpringFactory.getImpl(BaseSecurity.class);
RepositoryModule repositoryModule = CoreSpringFactory.getImpl(RepositoryModule.class);
diff --git a/src/main/java/org/olat/repository/RepositoryManager.java b/src/main/java/org/olat/repository/RepositoryManager.java
index 3e7b54785f77802c3153bb0745e218ba20b0a416..825d41963d336d9fa4d408c0122623c630e18966 100644
--- a/src/main/java/org/olat/repository/RepositoryManager.java
+++ b/src/main/java/org/olat/repository/RepositoryManager.java
@@ -2137,7 +2137,7 @@ public class RepositoryManager extends BasicManager {
if(re == null) return Collections.emptyList();
StringBuilder sb = new StringBuilder();
- sb.append("select membership.identity.key, membership.lastModified, membership.role ")
+ sb.append("select membership.identity.key, membership.creationDate, membership.lastModified, membership.role ")
.append(" from ").append(RepositoryEntry.class.getName()).append(" as v ")
.append(" inner join v.groups as relGroup on relGroup.defaultGroup=true")
.append(" inner join relGroup.group as baseGroup")
@@ -2153,7 +2153,8 @@ public class RepositoryManager extends BasicManager {
for(Object[] membership:members) {
Long identityKey = (Long)membership[0];
Date lastModified = (Date)membership[1];
- Object role = membership[2];
+ Date creationDate = (Date)membership[2];
+ Object role = membership[3];
RepositoryEntryMembership mb = memberships.get(identityKey);
if(mb == null) {
@@ -2162,6 +2163,7 @@ public class RepositoryManager extends BasicManager {
mb.setRepoKey(re.getKey());
memberships.put(identityKey, mb);
}
+ mb.setCreationDate(creationDate);
mb.setLastModified(lastModified);
if(GroupRoles.participant.name().equals(role)) {
diff --git a/src/main/java/org/olat/repository/ui/author/ImportRepositoryEntryController.java b/src/main/java/org/olat/repository/ui/author/ImportRepositoryEntryController.java
index e43bf7d53a2bb69f64ecdaf015fb54949eb28ab9..d2573f00e333846b919630e70de7d6a7e74b039d 100644
--- a/src/main/java/org/olat/repository/ui/author/ImportRepositoryEntryController.java
+++ b/src/main/java/org/olat/repository/ui/author/ImportRepositoryEntryController.java
@@ -189,10 +189,8 @@ public class ImportRepositoryEntryController extends FormBasicController {
}
allOk &= validLimitationOnType(handlerForUploadedResources);
-
- return allOk & handlerForUploadedResources != null
- & handlerForUploadedResources.size() > 0
- & super.validateFormLogic(ureq);
+ allOk &= handlerForUploadedResources != null && handlerForUploadedResources.size() > 0;
+ return allOk & super.validateFormLogic(ureq);
}
private boolean validLimitationOnType(List<ResourceHandler> handlers) {
diff --git a/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java b/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java
index 4a194751f4597bdc0a5169eae4b1c50d740538a5..42d9888eaf9778487acbe5eccb4a7f3c176bed93 100644
--- a/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java
+++ b/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java
@@ -155,10 +155,10 @@ public class RepositoryEntryDetailsController extends FormBasicController {
private String baseUrl;
private final boolean guestOnly;
- public RepositoryEntryDetailsController(UserRequest ureq, WindowControl wControl, RepositoryEntryRow row, boolean inRuntime) {
+ public RepositoryEntryDetailsController(UserRequest ureq, WindowControl wControl, RepositoryEntry entry, RepositoryEntryRow row, boolean inRuntime) {
this(ureq, wControl, inRuntime);
this.row = row;
- entry = repositoryService.loadByKey(row.getKey());
+ this.entry = entry;
initForm(ureq);
}
diff --git a/src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java b/src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java
index 77b7abd917318afc50f62bf12dbffb67b3ec64f5..a8e0f1f2c7c1b181f71c227d22a80abffaa4522f 100644
--- a/src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java
+++ b/src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java
@@ -76,6 +76,7 @@ import org.olat.course.CorruptedCourseException;
import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryManager;
import org.olat.repository.RepositoryModule;
+import org.olat.repository.RepositoryService;
import org.olat.repository.model.SearchMyRepositoryEntryViewParams;
import org.olat.repository.model.SearchMyRepositoryEntryViewParams.Filter;
import org.olat.repository.model.SearchMyRepositoryEntryViewParams.OrderBy;
@@ -118,6 +119,8 @@ public class RepositoryEntryListController extends FormBasicController
private MapperService mapperService;
@Autowired
private RepositoryModule repositoryModule;
+ @Autowired
+ private RepositoryService repositoryService;
private final boolean guestOnly;
@@ -504,12 +507,18 @@ public class RepositoryEntryListController extends FormBasicController
OLATResourceable ores = OresHelper.createOLATResourceableInstance("Infos", 0l);
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
- detailsCtrl = new RepositoryEntryDetailsController(ureq, bwControl, row, false);
- listenTo(detailsCtrl);
- addToHistory(ureq, detailsCtrl);
-
- String displayName = row.getDisplayName();
- stackPanel.pushController(displayName, detailsCtrl);
+
+ RepositoryEntry entry = repositoryService.loadByKey(row.getKey());
+ if(entry == null) {
+ showWarning("repositoryentry.not.existing");
+ } else {
+ detailsCtrl = new RepositoryEntryDetailsController(ureq, bwControl, entry, row, false);
+ listenTo(detailsCtrl);
+ addToHistory(ureq, detailsCtrl);
+
+ String displayName = row.getDisplayName();
+ stackPanel.pushController(displayName, detailsCtrl);
+ }
}
}
diff --git a/src/main/webapp/static/js/functions.js b/src/main/webapp/static/js/functions.js
index 41149b093ddb29fa55935bbf8cf3a079907ce979..46f31f73c7523d41f4aa0bf3f3358ce6fb70a5d8 100644
--- a/src/main/webapp/static/js/functions.js
+++ b/src/main/webapp/static/js/functions.js
@@ -1180,6 +1180,18 @@ function o_XHRSubmit(formNam) {
return true;
} else {
var data = form.serializeArray();
+ if(arguments.length > 1) {
+ var argLength = arguments.length;
+ for(var i=1; i<argLength; i=i+2) {
+ if(argLength > i+1) {
+ var argData = new Object();
+ argData["name"] = arguments[i];
+ argData["value"] = arguments[i+1];
+ data[data.length] = argData;
+ }
+ }
+ }
+
var targetUrl = form.attr("action");
jQuery.ajax(targetUrl,{
type:'POST',
@@ -1319,7 +1331,6 @@ function o_XHREvent(targetUrl, dirtyCheck, push) {
return false;
}
-
//by pass every check and don't wait a response from the response
//typically used to send GUI settings back to the server
function o_XHRNFEvent(targetUrl) {
@@ -1362,7 +1373,11 @@ function o_pushState(historyPointId, title, url) {
var data = new Object();
data['businessPath'] = url;
data['historyPointId'] = historyPointId;
- o_info.businessPath=url;
+
+ if(url != null && !(url.lastIndexOf("http", 0) === 0) && !(url.lastIndexOf("https", 0) === 0)) {
+ url = o_info.serverUri + url;
+ }
+ o_info.businessPath = url;
o_shareActiveSocialUrl();
if(window.history && !(typeof window.history === "undefined") && window.history.pushState) {
window.history.pushState(data, title, url);
diff --git a/src/main/webapp/static/js/js.plugins.min.js b/src/main/webapp/static/js/js.plugins.min.js
index 83d068743d3f2bb79754067eeba0e0cdc8a19f1b..cd6616edb7532c98edcab65537d2a0e67e571c9f 100644
--- a/src/main/webapp/static/js/js.plugins.min.js
+++ b/src/main/webapp/static/js/js.plugins.min.js
@@ -5,7 +5,7 @@
* Dual licensed under the MIT or GPL Version 2 licenses.
*
*/
-jQuery.periodic=function(l,h){if(jQuery.isFunction(l)){h=l;l={}}var c=jQuery.extend({},jQuery.periodic.defaults,{ajax_complete:j,increment:g,reset:f,cancel:i},l);c.cur_period=c.period;c.tid=false;var e="";b();return c;function b(){i();c.tid=setTimeout(function(){h.call(c);g();if(c.tid){b()}},c.cur_period)}function j(n,m){if(m==="success"&&e!==n.responseText){e=n.responseText;f()}}function g(){c.cur_period*=c.decay;if(c.cur_period<c.period){f()}else{if(c.cur_period>c.max_period){c.cur_period=c.max_period;if(c.on_max!==undefined){c.on_max.call(c)}}}}function f(){c.cur_period=c.period;b()}function i(){clearTimeout(c.tid);c.tid=null}function k(){}function a(){}function d(){}};jQuery.periodic.defaults={period:4000,max_period:1800000,decay:1.5,on_max:undefined};var Hashtable=(function(){var p="function";var n=(typeof Array.prototype.splice==p)?function(s,r){s.splice(r,1)}:function(u,t){var s,v,r;if(t===u.length-1){u.length=t}else{s=u.slice(t+1);u.length=t;for(v=0,r=s.length;v<r;++v){u[t+v]=s[v]}}};function a(t){var r;if(typeof t=="string"){return t}else{if(typeof t.hashCode==p){r=t.hashCode();return(typeof r=="string")?r:a(r)}else{if(typeof t.toString==p){return t.toString()}else{try{return String(t)}catch(s){return Object.prototype.toString.call(t)}}}}}function g(r,s){return r.equals(s)}function e(r,s){return(typeof s.equals==p)?s.equals(r):(r===s)}function c(r){return function(s){if(s===null){throw new Error("null is not a valid "+r)}else{if(typeof s=="undefined"){throw new Error(r+" must not be undefined")}}}}var q=c("key"),l=c("value");function d(u,s,t,r){this[0]=u;this.entries=[];this.addEntry(s,t);if(r!==null){this.getEqualityFunction=function(){return r}}}var h=0,j=1,f=2;function o(r){return function(t){var s=this.entries.length,v,u=this.getEqualityFunction(t);while(s--){v=this.entries[s];if(u(t,v[0])){switch(r){case h:return true;case j:return v;case f:return[s,v[1]]}}}return false}}function k(r){return function(u){var v=u.length;for(var t=0,s=this.entries.length;t<s;++t){u[v+t]=this.entries[t][r]}}}d.prototype={getEqualityFunction:function(r){return(typeof r.equals==p)?g:e},getEntryForKey:o(j),getEntryAndIndexForKey:o(f),removeEntryForKey:function(s){var r=this.getEntryAndIndexForKey(s);if(r){n(this.entries,r[0]);return r[1]}return null},addEntry:function(r,s){this.entries[this.entries.length]=[r,s]},keys:k(0),values:k(1),getEntries:function(s){var u=s.length;for(var t=0,r=this.entries.length;t<r;++t){s[u+t]=this.entries[t].slice(0)}},containsKey:o(h),containsValue:function(s){var r=this.entries.length;while(r--){if(s===this.entries[r][1]){return true}}return false}};function m(s,t){var r=s.length,u;while(r--){u=s[r];if(t===u[0]){return r}}return null}function i(r,s){var t=r[s];return(t&&(t instanceof d))?t:null}function b(t,r){var w=this;var v=[];var u={};var x=(typeof t==p)?t:a;var s=(typeof r==p)?r:null;this.put=function(B,C){q(B);l(C);var D=x(B),E,A,z=null;E=i(u,D);if(E){A=E.getEntryForKey(B);if(A){z=A[1];A[1]=C}else{E.addEntry(B,C)}}else{E=new d(D,B,C,s);v[v.length]=E;u[D]=E}return z};this.get=function(A){q(A);var B=x(A);var C=i(u,B);if(C){var z=C.getEntryForKey(A);if(z){return z[1]}}return null};this.containsKey=function(A){q(A);var z=x(A);var B=i(u,z);return B?B.containsKey(A):false};this.containsValue=function(A){l(A);var z=v.length;while(z--){if(v[z].containsValue(A)){return true}}return false};this.clear=function(){v.length=0;u={}};this.isEmpty=function(){return !v.length};var y=function(z){return function(){var A=[],B=v.length;while(B--){v[B][z](A)}return A}};this.keys=y("keys");this.values=y("values");this.entries=y("getEntries");this.remove=function(B){q(B);var C=x(B),z,A=null;var D=i(u,C);if(D){A=D.removeEntryForKey(B);if(A!==null){if(!D.entries.length){z=m(v,C);n(v,z);delete u[C]}}}return A};this.size=function(){var A=0,z=v.length;while(z--){A+=v[z].entries.length}return A};this.each=function(C){var z=w.entries(),A=z.length,B;while(A--){B=z[A];C(B[0],B[1])}};this.putAll=function(H,C){var B=H.entries();var E,F,D,z,A=B.length;var G=(typeof C==p);while(A--){E=B[A];F=E[0];D=E[1];if(G&&(z=w.get(F))){D=C(F,z,D)}w.put(F,D)}};this.clone=function(){var z=new b(t,r);z.putAll(w);return z}}return b})();(function(b){b.fn.ooLog=function(f,d,e){var c=null;b(this).each(function(){c=b(this).data("_ooLog");if(c==undefined){c=new a();b(this).data("_ooLog",c)}});if(f==undefined){return c}else{if(typeof f==="string"){if(c){c.log(f,d,e)}}}};function a(){return this}a.prototype={isDebugEnabled:function(){return o_info.JSTracingLogDebugEnabled},log:function(e,c,d){if(!this.isDebugEnabled()){return}jQuery.post(o_info.JSTracingUri,{level:e,logMsg:c,jsFile:d})}}})(jQuery);(function(b){b.fn.ooTranslator=function(){var d=null;b(document).each(function(){d=b(document).data("_ooTranslator");if(d==undefined){d=new a();b(document).data("_ooTranslator",d)}});return d};function a(){return this}a.prototype={mapperUrl:null,translators:null,initialize:function(d){this.mapperUrl=d;this.translators=new Object()},getTranslator:function(d,f){if(this.translators[d]==null){this.translators[d]=new Object()}if(this.translators[d][f]==null){var e=this.mapperUrl+"/"+d+"/"+f+"/translations.js";jQuery.ajax(e,{async:false,dataType:"json",success:function(g,i,h){jQuery(document).ooTranslator()._createTranslator(g,d,f)}})}return this.translators[d][f]},_createTranslator:function(e,d,f){this.translators[d][f]=new c().initialize(e,d,f)}};function c(){return this}c.prototype={localizationData:null,bundle:null,locale:null,initialize:function(f,d,e){this.bundle=e;this.locale=d;this.localizationData=f;return this},translate:function(d){if(this.localizationData[d]){return this.localizationData[d]}else{return this.bundle+":"+d}}}})(jQuery);+function(b){var a=function(){this.addExtraElements();this.state={busy:false,brandW:0,sitesW:0,sitesDirty:false,sites:{collapsed:this.isSitesCollapsed(),extended:this.isSitesExtended},tabsW:0,tabsDirty:false,tabs:{collapsed:this.isTabsCollapsed(),extended:this.isTabsExtended()},toolsW:0,toolsDirty:false,tools:{collapsed:this.isToolsCollapsed(),extended:this.isToolsExtended()},offCanvasWidth:0,moreW:0};var c=b("#o_offcanvas_right").css("width");if(c){this.state.offCanvasWidth=parseInt(c.replace(/[^\d.]/g,""));this.initListners();this.calculateWidth();this.optimize()}};a.prototype.initListners=function(){b(window).resize(b.proxy(this.onResizeCallback,this));b(document).on("oo.nav.sites.modified",b.proxy(function(){this.state.sitesDirty=true},this));b(document).on("oo.nav.tabs.modified",b.proxy(function(){this.state.tabsDirty=true},this));b(document).on("oo.nav.tools.modified",b.proxy(function(){this.state.toolsDirty=true},this));b(document).on("oo.dom.replacement.after",b.proxy(this.onDOMreplacementCallback,this));b(window).on("orientationchange",b.proxy(this.hideRight,this));b("#o_navbar_right-toggle").on("click",b.proxy(this.toggleRight,this));b("#o_offcanvas_right .o_offcanvas_close").on("click",b.proxy(this.hideRight,this));b("#o_navbar_more").on("shown.bs.dropdown",this.onDropdownShown);b("#o_navbar_more").on("hidden.bs.dropdown",this.onDropdownHidden)};a.prototype.onResizeCallback=function(){if(!this.state.busy){this.state.busy=true;this.calculateWidth();this.optimize();this.state.busy=false}};a.prototype.onDOMreplacementCallback=function(){if(!this.state.busy&&(this.state.sitesDirty||this.state.tabsDirty||this.state.toolsDirty)){this.state.busy=true;this.cleanupMoreDropdown();this.calculateWidth();this.optimize();this.state.sitesDirty=false;this.state.tabsDirty=false;this.state.toolsDirty=false;this.state.busy=false}};a.prototype.onDropdownShown=function(c){var f=b("#o_navbar_more .dropdown-menu");if(f.length){var d=f.offset().left;if(d<0){f.removeClass("dropdown-menu-right")}}};a.prototype.onDropdownHidden=function(c){var d=b("#o_navbar_more .dropdown-menu");d.addClass("dropdown-menu-right")};a.prototype.calculateWidth=function(){var c=b("#o_navbar_container .o_navbar-collapse");this.state.navbarW=c.innerWidth();this.state.brandW=b(".o_navbar-brand").outerWidth(true);this.state.sitesW=this.getSites().outerWidth(true);this.state.tabsW=this.getTabs().outerWidth(true);this.state.toolsW=this.getTools().outerWidth(false);this.state.moreW=b("#o_navbar_more:visible").outerWidth(true)};a.prototype.getOverflow=function(c){var d=this.state.navbarW;d-=this.state.sitesW;d-=this.state.tabsW;d-=this.state.toolsW;d-=this.state.brandW;d-=this.state.moreW;d-=25;return -d};a.prototype.optimize=function(h){var c=this.getOverflow();var k=this.getSites();var l=this.getTabs();var g=this.getTools();var n=this.getMoreDropdown();var f=this.getOffcanvasRight();this.updateState();while(c>0&&(!this.state.tabs.collapsed||!this.state.sites.collapsed||!this.state.tools.collapsed)){if(!this.state.tabs.collapsed){this.collapse(l,n,"li","o_dropdown_tab")}else{if(!this.state.sites.collapsed){this.collapse(k,n,"li","o_dropdown_site")}else{if(!this.state.tools.collapsed){this.collapse(g,f,".o_navbar_tool:not(#o_navbar_imclient, #o_navbar_search_opener, #o_navbar_my_menu)","o_tool_right")}}}this.calculateWidth();c=this.getOverflow();this.updateState()}while(c<0&&(!this.state.tabs.extended||!this.state.sites.extended||!this.state.tools.extended)){if(!this.state.tools.extended){var m=this.extend(f,g.children("#o_navbar_imclient, #o_navbar_search_opener, #o_navbar_my_menu").first(),".o_tool_right","o_tool_right",true);if(!m){break}}if(!this.state.sites.extended){var j=this.extend(n,k,"li","o_dropdown_site");if(!j){break}}else{if(!this.state.tabs.extended){var d=this.extend(n,l,"li","o_dropdown_tab");if(!d){break}}}this.calculateWidth();c=this.getOverflow();this.updateState()}if(this.state.sites.extended&&this.state.tabs.extended){var i=b("#o_navbar_more");i.css("display","none")}this.checkToolsOrder()};a.prototype.updateState=function(){this.state.sites.collapsed=this.isSitesCollapsed();this.state.sites.extended=this.isSitesExtended();this.state.tabs.collapsed=this.isTabsCollapsed();this.state.tabs.extended=this.isTabsExtended();this.state.tools.collapsed=this.isToolsCollapsed();this.state.tools.extended=this.isToolsExtended()};a.prototype.collapse=function(g,d,c,f){var e=g.find(c);if(e.length){e=e.last()}if(e.length){f&&e.addClass(f);if(d){e.prependTo(d)}}this.updateDropdownToggle(g)};a.prototype.extend=function(g,d,c,i,f){var e=g.find(c);if(e.length){e=e.first()}var j=false;if(e.length){if(d&&d.length){if(f){d.before(e)}else{e.appendTo(d)}this.updateDropdownToggle(g);this.calculateWidth();var h=this.getOverflow();if(h>0){e.prependTo(g)}else{i&&e.removeClass(i);j=true}}}this.updateDropdownToggle(g);return j};a.prototype.updateDropdownToggle=function(c){var d=c.parents(".o_dropdown_toggle");if(!d.length){return}if(c.children().length){d.css("display","block")}else{d.css("display","none")}};a.prototype.addExtraElements=function(){var d=b("#o_navbar_container .o_navbar-collapse");var c=b("#o_navbar_more");if(c.length==0){c=b('<ul id="o_navbar_more" class="nav o_navbar-nav o_dropdown_toggle"><li><a class="dropdown-toggle" data-toggle="dropdown" href="#"">'+o_info.i18n_topnav_more+' <b class="caret"></b></a><ul class="dropdown-menu dropdown-menu-right"></ul></li></ul>');c.appendTo(d)}this.getSites().append('<li class="divider o_dropdown_site"></li>');b("#o_navbar_help .o_icon, #o_navbar_print .o_icon").addClass("o_icon-fw")};a.prototype.cleanupMoreDropdown=function(){if(!this.state.sitesDirty){var f=this.getSites();var d=this.getMoreDropdown().children(".o_dropdown_site");d.appendTo(f)}else{this.getSites().append('<li class="divider o_dropdown_site"></li>')}if(!this.state.tabsDirty){var e=this.getTabs();var c=this.getMoreDropdown().children(".o_dropdown_tab");c.prependTo(e)}this.getMoreDropdown().empty()};a.prototype.checkToolsOrder=function(){var f=this.getTools();var e=f.find("#o_navbar_help");var d=f.find("#o_navbar_print");var c=f.find("#o_navbar_imclient");if(c&&d){c.after(d)}if(c&&e){c.after(e)}};a.prototype.showRight=function(){if(!this.isOffcanvasVisible()&&!this.offcanvasTransitioning){this.offcanvasTransitioning=true;var d=this;var c=b("#o_offcanvas_right");c.show().transition({x:-d.state.offCanvasWidth},function(){d.offcanvasTransitioning=false;b("body").addClass("o_offcanvas_right_visible");var e=b.proxy(d.hideRightOnClick,d);setTimeout(function(){b("html").on("click",e)},10)})}};a.prototype.hideRightOnClick=function(c){if("INPUT"!=c.target.nodeName){this.hideRight()}};a.prototype.hideRight=function(){if(this.isOffcanvasVisible()&&!this.offcanvasTransitioning){this.offcanvasTransitioning=true;b("html").off("click",b.proxy(this.hideRight,this));var d=this;var c=b("#o_offcanvas_right");c.transition({x:d.state.offCanvasWidth},function(){d.offcanvasTransitioning=false;c.hide();b("body").removeClass("o_offcanvas_right_visible")})}};a.prototype.toggleRight=function(){if(this.isOffcanvasVisible()){this.hideRight()}else{this.showRight()}};a.prototype.isOffcanvasVisible=function(){return b("#o_offcanvas_right:visible").length};a.prototype.getSites=function(){return b("#o_navbar_container .o_navbar_sites")};a.prototype.getTabs=function(){return b("#o_navbar_container .o_navbar_tabs")};a.prototype.getTools=function(){return b("#o_navbar_container #o_navbar_tools_permanent")};a.prototype.getMoreDropdown=function(){return b("#o_navbar_more .dropdown-menu")};a.prototype.getOffcanvasRight=function(){return b("#o_offcanvas_right_container .o_navbar-right")};a.prototype.isSitesCollapsed=function(){return !this.getSites().children("li").not(".divider").length};a.prototype.isSitesExtended=function(){return !this.getMoreDropdown().children(".o_dropdown_site").not(".divider").length};a.prototype.isTabsCollapsed=function(){return !this.getTabs().children("li").length};a.prototype.isTabsExtended=function(){return !this.getMoreDropdown().children(".o_dropdown_tab").length};a.prototype.isToolsCollapsed=function(){return !this.getTools().children(".o_navbar_tool").not("#o_navbar_imclient, #o_navbar_search_opener, #o_navbar_my_menu").length};a.prototype.isToolsExtended=function(){return !this.getOffcanvasRight().children(".o_tool_right").length};b(document).ready(function(){var d=b("#o_navbar_wrapper");if(d){var c=new a();window.OPOL.navbar=c}})}(jQuery);+function(b){b.fn.ooBgCarrousel=function(){return new a()};var a=function(){};a.prototype.initCarrousel=function(g){this.settings=b.extend({query:null,images:[],shuffle:false,shuffleFirst:false,durationshow:5000,durationout:500,durationin:500,easeout:"ease",easein:"ease"},g);this.pos=null;if(this.settings.query==null||this.settings.images.length==0){return}this.initialImage=this.settings.images[0];if(this.settings.shuffle){var f=this.settings.images;for(var d,c,e=f.length;e;d=parseInt(Math.random()*e),c=f[--e],f[e]=f[d],f[d]=c){}}if(this.settings.shuffleFirst){this._replaceImage()}this.rotate()};a.prototype.rotate=function(){setTimeout(b.proxy(this._hideCurrent,this),this.settings.durationshow)};a.prototype._hideCurrent=function(){var c=b(this.settings.query);if(c&&c.size()>0){c.transition({opacity:0,duration:this.settings.durationout,easing:this.settings.easeout},b.proxy(this._showNext,this))}};a.prototype._replaceImage=function(d){if(!d){d=b(this.settings.query)}if(d&&d.size()>0){this.newImg="";this.oldImg="";if(this.pos==null){this.pos=1;this.oldImg=this.initialImage}else{this.oldImg=this.settings.images[this.pos];this.pos++;if(this.settings.images.length==this.pos){this.pos=0}}this.newImg=this.settings.images[this.pos];var c=d.css("background-image");if(c.indexOf(this.oldImg)==-1){d.transition({opacity:1,duration:0});return}var e=c.replace(this.oldImg,this.newImg);d.css("background-image",e)}};a.prototype._showNext=function(){var c=b(this.settings.query);this._replaceImage(c);c.transition({opacity:1,duration:this.settings.durationin,easing:this.settings.easein},b.proxy(this.rotate,this))}}(jQuery);!function(a){function b(){function b(a){"remove"===a&&this.each(function(a,b){var c=e(b);c&&c.remove()}),this.find("span.mceEditor,div.mceEditor").each(function(a,b){var c=tinymce.get(b.id.replace(/_parent$/,""));c&&c.remove()})}function d(a){var c,d=this;if(null!=a)b.call(d),d.each(function(b,c){var d;(d=tinymce.get(c.id))&&d.setContent(a)});else if(d.length>0&&(c=tinymce.get(d[0].id)))return c.getContent()}function e(a){var b=null;return a&&a.id&&g.tinymce&&(b=tinymce.get(a.id)),b}function f(a){return!!(a&&a.length&&g.tinymce&&a.is(":tinymce"))}var h={};a.each(["text","html","val"],function(b,g){var i=h[g]=a.fn[g],j="text"===g;a.fn[g]=function(b){var g=this;if(!f(g))return i.apply(g,arguments);if(b!==c)return d.call(g.filter(":tinymce"),b),i.apply(g.not(":tinymce"),arguments),g;var h="",k=arguments;return(j?g:g.eq(0)).each(function(b,c){var d=e(c);h+=d?j?d.getContent().replace(/<(?:"[^"]*"|'[^']*'|[^'">])*>/g,""):d.getContent({save:!0}):i.apply(a(c),k)}),h}}),a.each(["append","prepend"],function(b,d){var g=h[d]=a.fn[d],i="prepend"===d;a.fn[d]=function(a){var b=this;return f(b)?a!==c?("string"==typeof a&&b.filter(":tinymce").each(function(b,c){var d=e(c);d&&d.setContent(i?a+d.getContent():d.getContent()+a)}),g.apply(b.not(":tinymce"),arguments),b):void 0:g.apply(b,arguments)}}),a.each(["remove","replaceWith","replaceAll","empty"],function(c,d){var e=h[d]=a.fn[d];a.fn[d]=function(){return b.call(this,d),e.apply(this,arguments)}}),h.attr=a.fn.attr,a.fn.attr=function(b,g){var i=this,j=arguments;if(!b||"value"!==b||!f(i))return g!==c?h.attr.apply(i,j):h.attr.apply(i,j);if(g!==c)return d.call(i.filter(":tinymce"),g),h.attr.apply(i.not(":tinymce"),j),i;var k=i[0],l=e(k);return l?l.getContent({save:!0}):h.attr.apply(a(k),j)}}var c,d,e,f=[],g=window;a.fn.tinymce=function(c){function h(){var d=[],f=0;e||(b(),e=!0),l.each(function(a,b){var e,g=b.id,h=c.oninit;g||(b.id=g=tinymce.DOM.uniqueId()),tinymce.get(g)||(e=new tinymce.Editor(g,c,tinymce.EditorManager),d.push(e),e.on("init",function(){var a,b=h;l.css("visibility",""),h&&++f==d.length&&("string"==typeof b&&(a=-1===b.indexOf(".")?null:tinymce.resolve(b.replace(/\.\w+$/,"")),b=tinymce.resolve(b)),b.apply(a||tinymce,d))}))}),a.each(d,function(a,b){b.render()})}var i,j,k,l=this,m="";if(!l.length)return l;if(!c)return window.tinymce?tinymce.get(l[0].id):null;if(l.css("visibility","hidden"),g.tinymce||d||!(i=c.script_url))1===d?f.push(h):h();else{d=1,j=i.substring(0,i.lastIndexOf("/")),-1!=i.indexOf(".min")&&(m=".min"),g.tinymce=g.tinyMCEPreInit||{base:j,suffix:m},-1!=i.indexOf("gzip")&&(k=c.language||"en",i=i+(/\?/.test(i)?"&":"?")+"js=true&core=true&suffix="+escape(m)+"&themes="+escape(c.theme||"modern")+"&plugins="+escape(c.plugins||"")+"&languages="+(k||""),g.tinyMCE_GZ||(g.tinyMCE_GZ={start:function(){function b(a){tinymce.ScriptLoader.markDone(tinymce.baseURI.toAbsolute(a))}b("langs/"+k+".js"),b("themes/"+c.theme+"/theme"+m+".js"),b("themes/"+c.theme+"/langs/"+k+".js"),a.each(c.plugins.split(","),function(a,c){c&&(b("plugins/"+c+"/plugin"+m+".js"),b("plugins/"+c+"/langs/"+k+".js"))})},end:function(){}}));var n=document.createElement("script");n.type="text/javascript",n.onload=n.onreadystatechange=function(b){b=b||window.event,2===d||"load"!=b.type&&!/complete|loaded/.test(n.readyState)||(tinymce.dom.Event.domLoaded=1,d=2,c.script_loaded&&c.script_loaded(),h(),a.each(f,function(a,b){b()}))},n.src=i,document.body.appendChild(n)}return l},a.extend(a.expr[":"],{tinymce:function(a){var b;return a.id&&"tinymce"in window&&(b=tinymce.get(a.id),b&&b.editorManager===tinymce)?!0:!1}})}(jQuery);OPOL={};var o2c=0;var o3c=new Array();o_info.guibusy=false;o_info.linkbusy=false;o_info.debug=true;var BLoader={_ajaxLoadedJS:new Array(),_isAlreadyLoadedJS:function(b){var a=true;jQuery("head script[src]").each(function(d,c){if(jQuery(c).attr("src").indexOf(b)!=-1){a=false}});if(jQuery.inArray(b,this._ajaxLoadedJS)!=-1){a=false}return !a},loadJS:function(b,c,a){if(!this._isAlreadyLoadedJS(b)){if(o_info.debug){o_log("BLoader::loadJS: loading ajax::"+a+" url::"+b)}if(a){jQuery.ajax(b,{async:false,dataType:"script",cache:true,success:function(d,f,e){}});this._ajaxLoadedJS.push(b)}else{jQuery.getScript(b)}if(o_info.debug){o_log("BLoader::loadJS: loading DONE url::"+b)}}else{if(o_info.debug){o_log("BLoader::loadJS: already loaded url::"+b)}}},executeGlobalJS:function(jsString,contextDesc){try{if(window.execScript){window.execScript(jsString)}else{window.eval(jsString)}}catch(e){if(window.console){console.log(contextDesc,"cannot execute js",jsString)}if(o_info.debug){o_logerr("BLoader::executeGlobalJS: Error when executing JS code in contextDesc::"+contextDesc+' error::"'+showerror(e)+" for: "+escape(jsString))}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","BLoader::executeGlobalJS: Error when executing JS code in contextDesc::"+contextDesc+' error::"'+showerror(e)+" for: "+escape(jsString),"functions.js::BLoader::executeGlobalJS::"+contextDesc)}if(window.location.href.indexOf("o_winrndo")!=-1){window.location.reload()}else{window.location.href=window.location.href+(window.location.href.indexOf("?")!=-1?"&":"?")+"o_winrndo=1"}}},loadCSS:function(b,o,q){var r=window.document;try{if(r.createStyleSheet){var j=r.styleSheets;var d=0;var p=0;for(i=0;i<j.length;i++){var m=j[i];var g=m.href;if(g==b){d++;if(m.disabled){m.disabled=false;return}else{if(o_info.debug){o_logwarn("BLoader::loadCSS: style: "+b+" already in document and not disabled! (duplicate add)")}return}}if(m.id=="o_theme_css"){p=i}}if(d>1&&o_info.debug){o_logwarn("BLoader::loadCSS: apply styles: num of stylesheets found was not 0 or 1:"+d)}if(q){p=j.length}var f=r.createStyleSheet(b,p)}else{var c=jQuery("#"+o);if(c&&c.size()>0){if(o_info.debug){o_logwarn("BLoader::loadCSS: stylesheet already found in doc when trying to add:"+b+", with id "+o)}return}else{var a=jQuery('<link id="'+o+'" rel="stylesheet" type="text/css" href="'+b+'">');if(q){a.insertBefore(jQuery("#o_fontSize_css"))}else{a.insertBefore(jQuery("#o_theme_css"))}}}}catch(n){if(window.console){console.log(n)}if(o_info.debug){o_logerr("BLoader::loadCSS: Error when loading CSS from URL::"+b)}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","BLoader::loadCSS: Error when loading CSS from URL::"+b,"functions.js::BLoader::loadCSS")}}},unLoadCSS:function(a,m){var n=window.document;try{if(n.createStyleSheet){var f=n.styleSheets;var d=0;var o=a;var b=window.location.href.substring(0,window.location.href.indexOf("/",8));if(a.indexOf(b)==0){o=a.substring(b.length)}for(i=0;i<f.length;i++){var g=f[i].href;if(g==a||g==o){d++;if(!f[i].disabled){f[i].disabled=true}else{if(o_info.debug){o_logwarn("stylesheet: when removing: matching url, but already disabled! url:"+g)}}}}if(d!=1&&o_info.debug){o_logwarn("stylesheet: when removeing: num of stylesheets found was not 1:"+d)}}else{var c=jQuery("#"+m);if(c){c.href="";c.remove();c=null;return}else{if(o_info.debug){o_logwarn("no link with id found to remove, id:"+m+", url "+a)}}}}catch(j){if(o_info.debug){o_logerr("BLoader::unLoadCSS: Error when unloading CSS from URL::"+a)}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","BLoader::unLoadCSS: Error when unloading CSS from URL::"+a,"functions.js::BLoader::loadCSS")}}}};var BFormatter={formatLatexFormulas:function(b){try{if(window.jsMath){if(jsMath.loaded&&jsMath.tex2math&&jsMath.tex2math.loaded){jsMath.Process()}else{jsMath.Autoload.LoadJsMath();setTimeout(function(){BFormatter.formatLatexFormulas(b)},100)}}}catch(a){if(window.console){console.log("error in BFormatter.formatLatexFormulas: ",a)}}}};function o_init(){try{o_getMainWin().o_afterserver()}catch(a){if(o_info.debug){o_log("error in o_init: "+showerror(a))}}}function o_initEmPxFactor(){o_info.emPxFactor=jQuery("#o_width_1em").width();if(o_info.emPxFactor==0||o_info.emPxFactor=="undefined"){o_info.emPxFactor=12;if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Could not read with of element b_width_1em, set o_info.emPxFactor to 12","functions.js")}}}function o_getMainWin(){try{if(window.OPOL){return window}else{if(window.opener&&window.opener.OPOL){return window.opener}}}catch(a){if(o_info.debug){o_logerr('Exception while getting main window. rror::"'+showerror(a))}if(window.console){console.log('Exception while getting main window. rror::"'+showerror(a),"functions.js");console.log(a)}}throw"Can not find main OpenOLAT window"}function o_beforeserver(){o_info.linkbusy=true;showAjaxBusy();if(window.suppressOlatOnUnloadOnce){window.suppressOlatOnUnloadOnce=false}else{if(window.olatonunload){olatonunload()}}}function o_afterserver(){o2c=0;o_info.linkbusy=false;removeAjaxBusy()}function o2cl(){try{if(o_info.linkbusy){return false}else{var b=(o2c==0||confirm(o_info.dirty_form));if(b){o_beforeserver()}return b}}catch(a){if(window.console){console.log(a)}return false}}function o2cl_noDirtyCheck(){if(o_info.linkbusy){return false}else{o_beforeserver();return true}}function o3cl(d){if(o_info.linkbusy){return false}else{var b=o3c1.indexOf(d)>-1;var a=(b&&o3c1.length>1)||o3c1.length>0;var c=(!a||confirm(o_info.dirty_form));if(c){o_beforeserver()}return c}}function o_onc(a){var b=a.responseText;BLoader.executeGlobalJS("o_info.last_o_onc="+b+";","o_onc");o_ainvoke(o_info.last_o_onc,false)}function o_allowNextClick(){o_info.linkbusy=false;removeAjaxBusy()}function removeBusyAfterDownload(c,b,a){o2c=0;o_afterserver()}Array.prototype.search=function(c,d){var a=this.length;for(var b=0;b<a;b++){if(this[b].constructor==Array){if(this[b].search(c,d)){return true;break}}else{if(d){if(this[b].indexOf(c)!=-1){return true;break}}else{if(this[b]==c){return true;break}}}}return false};if(!Function.prototype.curry){Function.prototype.curry=function(){if(arguments.length<1){return this}var a=this;var b=Array.prototype.slice.call(arguments);return function(){return a.apply(this,b.concat(Array.prototype.slice.call(arguments)))}}}if(!Array.prototype.indexOf){Array.prototype.indexOf=function(c){if(this==null){throw new TypeError()}var d=Object(this);var a=d.length>>>0;if(a===0){return -1}var e=0;if(arguments.length>1){e=Number(arguments[1]);if(e!=e){e=0}else{if(e!=0&&e!=Infinity&&e!=-Infinity){e=(e>0||-1)*Math.floor(Math.abs(e))}}}if(e>=a){return -1}var b=e>=0?e:Math.max(a-Math.abs(e),0);for(;b<a;b++){if(b in d&&d[b]===c){return b}}return -1}}var b_onDomReplacementFinished_callbacks=new Array();function b_AddOnDomReplacementFinishedCallback(a){var b=jQuery(document).ooLog().isDebugEnabled();if(b){jQuery(document).ooLog("debug","callback stack size: "+b_onDomReplacementFinished_callbacks.length,"functions.js ADD")}if(b&&b_onDomReplacementFinished_callbacks.toSource){jQuery(document).ooLog("debug","stack content"+b_onDomReplacementFinished_callbacks.toSource(),"functions.js ADD")}b_onDomReplacementFinished_callbacks.push(a);if(b){jQuery(document).ooLog("debug","push to callback stack, func: "+a,"functions.js ADD")}}var b_changedDomEl=new Array();function b_AddOnDomReplacementFinishedUniqueCallback(a){if(a.constructor==Array){if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","add: its an ARRAY! ","functions.js ADD")}if(b_onDomReplacementFinished_callbacks.search(a[0])){if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","push to callback stack, already there!!: "+a[0],"functions.js ADD")}return}}b_AddOnDomReplacementFinishedCallback(a)}var o_debug_trid=0;function o_ainvoke(N){if(N==undefined){return}o_info.inainvoke=true;var I=N.cmdcnt;if(I>0){jQuery(document).trigger("oo.dom.replacement.before");b_changedDomEl=new Array();if(o_info.debug){o_debug_trid++}var y=N.cmds;for(var T=0;T<I;T++){var J=y[T];var A=J.cmd;var R=J.cda;var U=J.w;var c=this.window;var K;if(c){switch(A){case 1:var M=R.e;BLoader.executeGlobalJS(M,"o_ainvoker::jsexec");if(o_info.debug){o_log("c1: execute jscode: "+M)}case 2:var u=R.cc;var F=R.cps;for(var Q=0;Q<u;Q++){var m=F[Q];var h=m.cid;var P=m.cidvis;var H=m.cw;var x=m.hfrag;var O=m.jsol;var g=m.hdr;if(o_info.debug){o_log("c2: redraw: "+m.cname+" ("+h+") "+m.hfragsize+" bytes, listener(s): "+m.clisteners)}var W=g+"\n\n"+x;var C="";var S=false;var E="o_c"+h;var B=jQuery("#"+E);if(B==null||B.length==0){E="o_fi"+h;B=jQuery("#"+E);S=true}if(B!=null){var w=jQuery("div.o_richtext_mce textarea",B);for(var L=0;L<w.length;L++){try{var a=jQuery(w.get(L)).attr("id");if(typeof top.tinymce!=undefined){top.tinymce.remove("#"+a)}}catch(Z){if(window.console){console.log(Z)}}}if(P){B.css("display","")}else{B.css("display","none")}if(S||!H){B.replaceWith(W)}else{try{B.empty().html(W);if(W.length>0&&B.get(0).innerHTML==""){B.get(0).innerHTML=W}}catch(Z){if(window.console){console.log(Z)}if(window.console){console.log("Fragment",W)}}b_changedDomEl.push(E)}B=null;if(C!=""){C.each(function(e){BLoader.executeGlobalJS(e,"o_ainvoker::inscripts")})}if(O!=""){BLoader.executeGlobalJS(O,"o_ainvoker::jsol")}}}break;case 3:c.o2c=0;var X=R.rurl;c.o_afterserver();c.document.location.replace(X);break;case 5:c.o2c=0;var X=R.rurl;c.o_afterserver();c.document.location.replace(X);break;case 6:c.o2c=0;c.o_afterserver();break;case 7:var o=c.document.location;var z=o.protocol+"//"+o.hostname;if(o.port!=""){z+=":"+o.port}var v=R.cssrm;for(Q=0;Q<v.length;Q++){var D=v[Q];var G=D.id;var f=z+D.url;BLoader.unLoadCSS(f,G);if(o_info.debug){o_log("c7: rm css: id:"+G+" ,url:'"+f+"'")}}var V=R.cssadd;for(k=0;k<V.length;k++){var D=V[k];var G=D.id;var f=z+D.url;var n=D.pt;BLoader.loadCSS(f,G,n);if(o_info.debug){o_log("c7: add css: id:"+G+" ,url:'"+f+"'")}}var p=R.jsadd;for(l=0;l<p.length;l++){var D=p[l];var Y=D.before;if(jQuery.type(Y)==="string"){BLoader.executeGlobalJS(Y,"o_ainvoker::preJsAdd")}var f=D.url;var q=D.enc;if(jQuery.type(f)==="string"){BLoader.loadJS(f,q,true)}if(o_info.debug){o_log("c7: add js: "+f)}}break;default:if(o_info.debug){o_log("?: unknown command "+A)}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Error in o_ainvoke(), ?: unknown command "+A,"functions.js")}break}}else{if(o_info.debug){o_log("could not find window??")}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Error in o_ainvoke(), could not find window??","functions.js")}}}var b=b_onDomReplacementFinished_callbacks.length;if(b_onDomReplacementFinished_callbacks.toSource&&jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","stack content"+b_onDomReplacementFinished_callbacks.toSource(),"functions.js")}for(mycounter=0;b>mycounter;mycounter++){if(mycounter>50){if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Stopped executing DOM replacement callback functions - to many functions::"+b_onDomReplacementFinished_callbacks.length,"functions.js")}break}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Stacksize before shift: "+b_onDomReplacementFinished_callbacks.length,"functions.js")}var s=b_onDomReplacementFinished_callbacks.shift();if(typeof s.length==="number"){if(s[0]=="glosshighlighter"){var d=s[1];if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","arr fct: "+d,"functions.js")}s=d}}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Executing DOM replacement callback function #"+mycounter+" with timeout funct::"+s,"functions.js")}s();if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Stacksize after timeout: "+b_onDomReplacementFinished_callbacks.length,"functions.js")}}jQuery(document).trigger("oo.dom.replacement.after")}o_info.inainvoke=false}function clearAfterAjaxIframeCall(){if(o_info.linkbusy){o_afterserver()}}function showAjaxBusy(){setTimeout(function(){if(o_info.linkbusy){try{if(jQuery("#o_ajax_busy_backdrop").length==0){jQuery("#o_body").addClass("o_ajax_busy");jQuery("#o_ajax_busy").modal({show:true,backdrop:"static",keyboard:"false"});jQuery("#o_ajax_busy").after('<div id="o_ajax_busy_backdrop" class="modal-backdrop in"></div>');jQuery("#o_ajax_busy>.modal-backdrop").remove();jQuery("#o_ajax_busy_backdrop").css({"z-index":1200})}}catch(a){if(window.console){console.log(a)}}}},700)}function removeAjaxBusy(){try{jQuery("#o_body").removeClass("o_ajax_busy");jQuery("#o_ajax_busy_backdrop").remove();jQuery("#o_ajax_busy").modal("hide")}catch(a){if(window.console){console.log(a)}}}function setFormDirty(c){o2c=1;var a=document.getElementById(c);if(a!=null){var b=a.olat_fosm_0;if(b==null){b=a.olat_fosm}if(b){b.className="btn o_button_dirty"}}else{if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Error in setFormDirty, myForm was null for formId="+c,"functions.js")}}}function contextHelpWindow(a){helpWindow=window.open(a,"HelpWindow","height=760, width=940, left=0, top=0, location=no, menubar=no, resizable=yes, scrollbars=yes, toolbar=no");helpWindow.focus()}function o_openPopUp(b,d,c,a,e){attributes="height="+a+", width="+c+", resizable=yes, scrollbars=yes, left=100, top=100, ";if(e){attributes+="location=yes, menubar=yes, status=yes, toolbar=yes"}else{attributes+="location=no, menubar=no, status=no, toolbar=no"}var f=window.open(b,d,attributes);f.focus();if(o_info.linkbusy){o_afterserver()}}function b_handleFileUploadFormChange(e,b,d){var f=e.value;slashPos=f.lastIndexOf("/");if(slashPos!=-1){f=f.substring(slashPos+1)}slashPos=f.lastIndexOf("\\");if(slashPos!=-1){f=f.substring(slashPos+1)}b.value=f;if(d){d.className="o_button_dirty"}var c=e.form.elements;for(i=0;i<c.length;i++){var a=c[i];if(a.name==b.name&&i+1<c.length){c[i+1].focus()}}}function gotonode(a){try{if(typeof o_activateCourseNode!="undefined"){o_activateCourseNode(a)}else{if(opener&&typeof opener.o_activateCourseNode!="undefined"){opener.o_activateCourseNode(a)}else{if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Error in gotonode(), could not find main window","functions.js")}}}}catch(b){alert("Goto node error:"+b);if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Error in gotonode()::"+b.message,"functions.js")}}}function o_viewportHeight(){var a=jQuery(document).height();if(a>0){return a}else{return 600}}OPOL.getMainColumnsMaxHeight=function(){var j=0,f=0,a=0,c=0,h=0,b,g=jQuery("#o_main_left_content"),e=jQuery("#o_main_right_content"),d=jQuery("#o_main_center_content");if(g!="undefined"&&g!=null){j=g.outerHeight(true)}if(e!="undefined"&&e!=null){f=e.outerHeight(true)}if(d!="undefined"&&d!=null){a=d.outerHeight(true)}c=(j>f?j:f);c=(c>a?c:a);if(c>0){return c}b=jQuery("#o_main");if(b!="undefined"&&b!=null){h=b.height()}if(b>0){return b}return o_viewportHeight()};OPOL.adjustHeight=function(){try{var a=0;col1=jQuery("#o_main_left_content").outerHeight(true);col2=jQuery("#o_main_right_content").outerHeight(true);col3=jQuery("#o_main_center_content").outerHeight(true);a=Math.max(col1,col2,col3);if(col1!=null){jQuery("#o_main_left").css({"min-height":a+"px"})}if(col2!=null){jQuery("#o_main_right").css({"min-height":a+"px"})}if(col3!=null){jQuery("#o_main_center").css({"min-height":a+"px"})}}catch(b){if(window.console){console.log(b)}}};jQuery(window).resize(function(){clearTimeout(o_info.resizeId);o_info.resizeId=setTimeout(function(){jQuery(document).trigger("oo.window.resize.after")},500)});jQuery(document).on("oo.window.resize.after",OPOL.adjustHeight);jQuery(document).on("oo.dom.replacement.after",OPOL.adjustHeight);jQuery().ready(OPOL.adjustHeight);function o_scrollToElement(a){try{jQuery("html, body").animate({scrollTop:jQuery(a).offset().top},333)}catch(b){}}function o_popover(c,b,a){if(typeof(a)==="undefined"){a="bottom"}jQuery("#"+c).popover({placement:a,html:true,trigger:"click",container:"body",content:function(){return jQuery("#"+b).clone().html()}}).on("shown.bs.popover",function(){var d=function(f){jQuery("#"+c).popover("hide");jQuery("body").unbind("click",d)};setTimeout(function(){jQuery("body").on("click",d)},5)})}function o_popoverWithTitle(d,c,b,a){if(typeof(a)==="undefined"){a="bottom"}return jQuery("#"+d).popover({placement:a,html:true,title:b,trigger:"click",container:"body",content:function(){return jQuery("#"+c).clone().html()}}).on("shown.bs.popover",function(){var e=function(f){jQuery("#"+d).popover("destroy");jQuery("body").unbind("click",e)};setTimeout(function(){jQuery("body").on("click",e)},5)})}function o_shareLinkPopup(d,c,b){if(typeof(b)==="undefined"){b="top"}var a=jQuery("#"+d);a.popover({placement:b,html:true,trigger:"click",container:"body",content:c}).on("shown.bs.popover",function(){var e=function(f){if(jQuery(f.target).data("toggle")!=="popover"&&jQuery(f.target).parents(".popover.in").length===0){jQuery("#"+d).popover("hide");jQuery("body").unbind("click",e)}};setTimeout(function(){jQuery("body").on("click",e)},5)});a.attr("title",a.attr("data-original-title"))}function o_QRCodePopup(d,c,b){if(typeof(b)==="undefined"){b="top"}var a=jQuery("#"+d);a.popover({placement:b,html:true,trigger:"click",container:"body",content:'<div id="'+d+'_pop" class="o_qrcode"></div>'}).on("shown.bs.popover",function(){o_info.qr=o_QRCode(d+"_pop",(jQuery.isFunction(c)?c():c));var e=function(f){if(jQuery(f.target).data("toggle")!=="popover"&&jQuery(f.target).parents(".popover.in").length===0){jQuery("#"+d).popover("hide");jQuery("body").unbind("click",e)}};setTimeout(function(){jQuery("body").on("click",e)},5)}).on("hidden.bs.popover",function(){try{o_info.qr.clear();delete o_info.qr}catch(f){}});a.attr("title",a.attr("data-original-title"))}function o_QRCode(c,b){try{BLoader.loadJS(o_info.o_baseURI+"/js/jquery/qrcodejs/qrcode.min.js","utf8",true);return new QRCode(document.getElementById(c),b)}catch(a){return null}}function b_resizeIframeToMainMaxHeight(f){var d=jQuery("#"+f);if(d!="undefined"&&d!=null){var c=OPOL.getMainColumnsMaxHeight()-110;var b=o_viewportHeight()-100;b=b-d.offset().top;var e=jQuery("#b_footer");if(e!="undefined"&&e!=null){b=b-e.outerHeight(true)}var a=(b>c?b:c);d.height(a)}}var o_debu_oldcn,o_debu_oldtt;function o_debu_show(b,a){if(o_debu_oldcn){o_debu_hide(o_debu_oldcn,o_debu_oldtt)}jQuery(b).addClass("o_dev_m");jQuery(a).show();o_debu_oldtt=a;o_debu_oldcn=b}function o_debu_hide(b,a){jQuery(a).hide();jQuery(b).removeClass("o_dev_m")}function o_dbg_mark(a){var b=jQuery("#"+a);if(b){b.css("background-color","#FCFCB8");b.css("border","3px solid #00F")}}function o_dbg_unmark(a){var b=jQuery("#"+a);if(b){b.css("border","");b.css("background-color","")}}function o_clearConsole(){o_log_all="";o_log(null)}var o_log_all="";function o_log(b){if(b){o_log_all="\n"+o_debug_trid+"> "+b+o_log_all;o_log_all=o_log_all.substr(0,4000)}var a=jQuery("#o_debug_cons");if(a){if(o_log_all.length==4000){o_log_all=o_log_all+"\n... (stripped: to long)... "}a.value=o_log_all}if(!jQuery.type(window.console)==="undefined"){window.console.log(b)}}function o_logerr(a){o_log("ERROR:"+a)}function o_logwarn(a){o_log("WARN:"+a)}function showerror(c){var a="";for(var b in c){a+=b+": "+c[b]+"\n"}return"error detail:\n"+a}function o_ffEvent(f,e,d,m,n){var g,h,b,a;g=document.getElementById(e);h=g.value;g.value=d;b=document.getElementById(m);a=b.value;b.value=n;var c=jQuery("#"+f);var j=c.attr("enctype");if(j&&j.indexOf("multipart")==0){o_XHRSubmitMultipart(f)}else{if(document.forms[f].onsubmit()){document.forms[f].submit()}}g.value=h;b.value=a}function o_IQEvent(a){if(document.forms[a].onsubmit()){document.forms[a].submit()}}function o_TableMultiActionEvent(a,c){var b=jQuery("#o_mai_"+a);b.val(c);if(document.forms[a].onsubmit()){document.forms[a].submit()}b.val("")}function o_XHRSubmit(a){if(o_info.linkbusy){return false}o_beforeserver();var b=true;var d=jQuery("#"+a);var f=d.attr("enctype");if(f&&f.indexOf("multipart")==0){var g="openolat-submit-"+(""+Math.random()).substr(2);var c=o_createIFrame(g);document.body.appendChild(c);d.attr("target",c.name);return true}else{var e=d.serializeArray();var h=d.attr("action");jQuery.ajax(h,{type:"POST",data:e,cache:false,dataType:"json",success:function(o,r,n){try{o_ainvoke(o);if(b){var j=o.businessPath;var m=o.documentTitle;var q=o.historyPointId;if(j){o_pushState(q,m,j)}}}catch(p){if(window.console){console.log(p)}}finally{o_afterserver()}},error:o_onXHRError});return false}}function o_XHRSubmitMultipart(a){var c=jQuery("#"+a);var d="openolat-submit-"+(""+Math.random()).substr(2);var b=o_createIFrame(d);document.body.appendChild(b);c.attr("target",b.name);c.submit();c.attr("target","")}function o_createIFrame(b){var a=jQuery('<iframe name="'+b+'" id="'+b+'" src="about:blank" style="position: absolute; top: -9999px; left: -9999px;"></iframe>');return a[0]}function o_removeIframe(a){jQuery("#"+a).remove()}function o_ffXHREvent(f,e,a,h,m,n,j){if(n){if(!o2cl()){return false}}else{if(!o2cl_noDirtyCheck()){return false}}var d=new Object();d.dispatchuri=a;d.dispatchevent=m;if(arguments.length>7){var g=arguments.length;for(var c=7;c<g;c=c+2){if(g>c+1){d[arguments[c]]=arguments[c+1]}}}var b=jQuery("#"+f).attr("action");jQuery.ajax(b,{type:"POST",data:d,cache:false,dataType:"json",success:function(r,u,q){try{o_ainvoke(r);if(j){var o=r.businessPath;var p=r.documentTitle;var t=r.historyPointId;if(o){o_pushState(t,p,o)}}}catch(s){if(window.console){console.log(s)}}finally{o_afterserver()}},error:o_onXHRError})}function o_XHREvent(f,d,a){if(d){if(!o2cl()){return false}}else{if(!o2cl_noDirtyCheck()){return false}}var c=new Object();if(arguments.length>3){var e=arguments.length;for(var b=3;b<e;b=b+2){if(e>b+1){c[arguments[b]]=arguments[b+1]}}}jQuery.ajax(f,{type:"POST",data:c,cache:false,dataType:"json",success:function(m,p,j){try{o_ainvoke(m);if(a){var g=m.businessPath;var h=m.documentTitle;var o=m.historyPointId;if(g){o_pushState(o,h,g)}}}catch(n){if(window.console){console.log(n)}}finally{o_afterserver()}},error:o_onXHRError});return false}function o_XHRNFEvent(d){var b=new Object();if(arguments.length>1){var c=arguments.length;for(var a=1;a<c;a=a+2){if(c>a+1){b[arguments[a]]=arguments[a+1]}}}jQuery.ajax(d,{type:"POST",data:b,cache:false,dataType:"json",success:function(f,g,e){},error:function(e,g,f){if(window.console){console.log("Error status",g)}}})}function o_onXHRError(a,d,b){o_afterserver();if(401==a.status){var c=o_info.oo_noresponse.replace("reload.html",window.document.location.href);showMessageBox("error",o_info.oo_noresponse_title,c,undefined)}else{if(window.console){console.log("Error status",d,b,a.responseText)}}}function o_pushState(d,f,a){try{var b=new Object();b.businessPath=a;b.historyPointId=d;o_info.businessPath=a;o_shareActiveSocialUrl();if(window.history&&!(typeof window.history==="undefined")&&window.history.pushState){window.history.pushState(b,f,a)}else{window.location.hash=d}}catch(c){if(window.console){console.log(c,a)}}}function setFlexiFormDirtyByListener(a){setFlexiFormDirty(a.data.formId)}function setFlexiFormDirty(b){var a=o3c.indexOf(b)>-1;if(!a){o3c.push(b)}jQuery("#"+b).each(function(){var c=jQuery(this).data("FlexiSubmit");if(c!=null){jQuery("#"+c).addClass("btn o_button_dirty");o2c=1}})}function o_ffRegisterSubmit(b,a){jQuery("#"+b).data("FlexiSubmit",a)}function showInfoBox(g,d){var c=Math.floor(Math.random()*65536).toString(16);var f='<div id="'+c+'" class="o_alert_info "><div class="alert alert-info clearfix o_sel_info_message"><i class="o_icon o_icon_close"></i><h3><i class="o_icon o_icon_info"></i> '+g+"</h3><p>"+d+"</p></div></div>";var a=jQuery("#o_messages").prepend(f);var e=(d.length>150)?8000:((d.length>70)?6000:4000);var b=function(){jQuery("#"+c).transition({top:"-100%"},333,function(){jQuery("#"+c).remove()})};jQuery("#"+c).show().transition({top:0},333);jQuery("#"+c).click(function(h){b()});o_scrollToElement("#o_top");g=null;d=null;a=null;e=null;setTimeout(function(){try{b()}catch(h){}},8000)}function showMessageBox(b,f,d,a){if(b=="info"){showInfoBox(f,d);return null}else{var c='<div id="myFunctionalModal" class="modal fade" role="dialog"><div class="modal-dialog"><div class="modal-content">';c+='<div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>';c+='<h4 class="modal-title">'+f+"</h4></div>";c+='<div class="modal-body alert ';if("warn"==b){c+="alert-warning"}else{if("error"==b){c+="alert-danger"}else{c+="alert-info"}}c+='"><p>'+d+"</p></div></div></div></div>";jQuery("#myFunctionalModal").remove();jQuery("body").append(c);var e=jQuery("#myFunctionalModal").modal("show").on("hidden.bs.modal",function(g){jQuery("#myFunctionalModal").remove()});o_scrollToElement("#o_top");return e}}function o_table_toggleCheck(d,c){var a=document.forms[d].elements.tb_ms;len=a.length;if(typeof(len)=="undefined"){a.checked=c}else{var b;for(b=0;b<len;b++){a[b].checked=c}}}function onTreeStartDrag(a,b){jQuery(a.target).addClass("o_dnd_proxy")}function onTreeStopDrag(a,b){jQuery(a.target).removeClass("o_dnd_proxy")}function onTreeDrop(g,h){var a=jQuery(h.draggable[0]);var f=jQuery(this);f.css({position:"",width:""});var c=f.droppable("option","endUrl");if(c.lastIndexOf("/")==(c.length-1)){c=c.substring(0,c.length-1)}var e=a.attr("id");var b=e.substring(2,e.length);c+="%3Atnidle%3A"+b;var d=f.attr("id");if(d.indexOf("ds")==0){c+="%3Asne%3Ayes"}else{if(d.indexOf("dt")==0){c+="%3Asne%3Aend"}}jQuery(".ui-droppable").each(function(j,m){jQuery(m).droppable("disable")});o_XHREvent(c+"/",false,false)}function treeAcceptDrop(a){return true}function treeAcceptDrop_notWithChildren(a){var c=false;var b=jQuery(a);var e=b.attr("id");if(e!=undefined&&(e.indexOf("dd")==0||e.indexOf("ds")==0||e.indexOf("dt")==0||e.indexOf("da")==0||e.indexOf("row")==0)){var g=jQuery(this);var j=g.attr("id");var d=e.substring(2,e.length);var f=j.substring(2,j.length);if(d!=f){var h=jQuery("#dd"+d).parents("li");if(h.length>0&&jQuery(h.get(0)).find("#dd"+f).length==0){c=true}}}return c}function treeAcceptDrop_portfolio(b){var d=false;var c=jQuery(b);var f=c.attr("id");if(treeNode_isDragNode(f)){var h=jQuery(this);var n=h.attr("id");var e=f.substring(2,f.length);var g=n.substring(2,n.length);var m=f.indexOf("ds")==0||f.indexOf("dt")==0;if(e!=g){var j=treeNode_portfolioType(c);var a=treeNode_portfolioType(h);if(j=="artefact"){if(a=="page"||a=="struct"||a=="artefact"){d=true}}else{if(j=="struct"){if(a=="page"||a=="struct"){d=true}}else{if(j=="page"){if(a=="map"||a=="page"){d=true}}}}}}return d}function treeNode_portfolioType(e){var c=jQuery(e.get(0));var d=treeNode_portfolioTypes(c);if(d==null){var a=c.parent("a");if(a.length>0){d=treeNode_portfolioTypes(jQuery(a.get(0)))}else{if(c.attr("id").indexOf("ds")==0){var b=c.prev("div");if(b.length>0){d=treeNode_portfolioTypes(b)}}else{if(c.attr("id").indexOf("dt")==0){var b=c.next("div");if(b.length>0){d=treeNode_portfolioTypes(b)}}}}}return d}function treeNode_portfolioTypes(a){if(a.find===undefined){return null}else{if(a.find(".o_ep_icon_struct").length>0||a.hasClass("o_ep_icon_struct")){return"struct"}else{if(a.find(".o_ep_icon_page").length>0||a.hasClass("o_ep_icon_page")){return"page"}else{if(a.find(".o_ep_icon_map").length>0||a.hasClass("o_ep_icon_map")){return"map"}else{if(a.find(".o_ep_artefact").length>0||a.hasClass("o_ep_artefact")){return"artefact"}}}}}return null}function treeNode_isDragNode(a){if(a!=undefined&&(a.indexOf("dd")==0||a.indexOf("ds")==0||a.indexOf("dt")==0||a.indexOf("da")==0||a.indexOf("row")==0)){return true}return false}function o_choice_toggleCheck(c,b){var d=document.forms[c].elements;len=d.length;if(typeof(len)=="undefined"){d.checked=b}else{var a;for(a=0;a<len;a++){if(d[a].type=="checkbox"&&d[a].getAttribute("class")=="o_checkbox"){d[a].checked=b}}}}function b_briefcase_isChecked(c,e){var b;var a=document.getElementById(c);var d=0;for(b=0;a.elements[b];b++){if(a.elements[b].type=="checkbox"&&a.elements[b].name=="paths"&&a.elements[b].checked){d++}}if(d<1){alert(e);return false}return true}function b_briefcase_toggleCheck(d,c){var a=document.getElementById(d);len=a.elements.length;var b;for(b=0;b<len;b++){if(a.elements[b].name=="paths"){a.elements[b].checked=c}}}function o_doPrint(){var d=jQuery("div.o_iframedisplay iframe");if(d.length>0){try{var a=d[0];frames[a.name].focus();frames[a.name].print();return}catch(c){for(i=0;frames.length>i;i++){a=frames[i];if(a.name=="oaa0"){continue}var b=document.getElementsByName(a.name)[0];if(b&&b.getAttribute("class")=="ext-shim"){continue}if(a.name!=""){try{frames[a.name].focus();frames[a.name].print()}catch(c){window.print()}return}}window.print()}}else{window.print()}}function b_attach_i18n_inline_editing(){jQuery("span.o_translation_i18nitem").hover(function(){jQuery(this.firstChild).show();if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Entered i18nitem::"+this.firstChild,"functions.js:b_attach_i18n_inline_editing()")}},function(){jQuery("a.o_translation_i18nitem_launcher").hide();if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Leaving i18nitem::"+this,"functions.js:b_attach_i18n_inline_editing()")}});jQuery("a.o_translation_i18nitem_launcher").hover(function(){var a=jQuery(this).parent("span.o_translation_i18nitem");a.effect("highlight")});b_AddOnDomReplacementFinishedCallback(b_attach_i18n_inline_editing)}function b_hideExtMessageBox(){}var BDebugger={_lastDOMCount:0,_lastObjCount:0,_knownGlobalOLATObjects:["o_afterserver","o_onc","o_getMainWin","o_ainvoke","o_info","o_beforeserver","o_ffEvent","o_openPopUp","o_debu_show","o_logwarn","o_dbg_unmark","o_ffRegisterSubmit","o_clearConsole","o_init","o_log","o_allowNextClick","o_dbg_mark","o_debu_hide","o_logerr","o_debu_oldcn","o_debu_oldtt","o_debug_trid","o_log_all"],_countDOMElements:function(){return document.getElementsByTagName("*").length},_countGlobalObjects:function(){var a=0;for(prop in window){a++}return a},logDOMCount:function(){var b=BDebugger;var a=b._countDOMElements();var c=a-b._lastDOMCount;console.log((c>0?"+":"")+c+" \t"+a+" \tDOM element count after DOM replacement");b._lastDOMCount=a;a=null},logGlobalObjCount:function(){var b=BDebugger;var a=b._countGlobalObjects();var c=a-b._lastObjCount;console.log((c>0?"+":"")+c+" \t"+a+" \tGlobal object count after DOM replacement");b._lastObjCount=a;a=null},logGlobalOLATObjects:function(){var b=BDebugger;var a=new Array();for(prop in window){if(prop.indexOf("o_")==0&&b._knownGlobalOLATObjects.indexOf(prop)==-1){a.push(prop)}}if(a.length>0){console.log(a.length+" global OLAT objects found:");a.each(function(c){console.log("\t"+typeof window[c]+" \t"+c)})}}};/*!
+jQuery.periodic=function(l,h){if(jQuery.isFunction(l)){h=l;l={}}var c=jQuery.extend({},jQuery.periodic.defaults,{ajax_complete:j,increment:g,reset:f,cancel:i},l);c.cur_period=c.period;c.tid=false;var e="";b();return c;function b(){i();c.tid=setTimeout(function(){h.call(c);g();if(c.tid){b()}},c.cur_period)}function j(n,m){if(m==="success"&&e!==n.responseText){e=n.responseText;f()}}function g(){c.cur_period*=c.decay;if(c.cur_period<c.period){f()}else{if(c.cur_period>c.max_period){c.cur_period=c.max_period;if(c.on_max!==undefined){c.on_max.call(c)}}}}function f(){c.cur_period=c.period;b()}function i(){clearTimeout(c.tid);c.tid=null}function k(){}function a(){}function d(){}};jQuery.periodic.defaults={period:4000,max_period:1800000,decay:1.5,on_max:undefined};var Hashtable=(function(){var p="function";var n=(typeof Array.prototype.splice==p)?function(s,r){s.splice(r,1)}:function(u,t){var s,v,r;if(t===u.length-1){u.length=t}else{s=u.slice(t+1);u.length=t;for(v=0,r=s.length;v<r;++v){u[t+v]=s[v]}}};function a(t){var r;if(typeof t=="string"){return t}else{if(typeof t.hashCode==p){r=t.hashCode();return(typeof r=="string")?r:a(r)}else{if(typeof t.toString==p){return t.toString()}else{try{return String(t)}catch(s){return Object.prototype.toString.call(t)}}}}}function g(r,s){return r.equals(s)}function e(r,s){return(typeof s.equals==p)?s.equals(r):(r===s)}function c(r){return function(s){if(s===null){throw new Error("null is not a valid "+r)}else{if(typeof s=="undefined"){throw new Error(r+" must not be undefined")}}}}var q=c("key"),l=c("value");function d(u,s,t,r){this[0]=u;this.entries=[];this.addEntry(s,t);if(r!==null){this.getEqualityFunction=function(){return r}}}var h=0,j=1,f=2;function o(r){return function(t){var s=this.entries.length,v,u=this.getEqualityFunction(t);while(s--){v=this.entries[s];if(u(t,v[0])){switch(r){case h:return true;case j:return v;case f:return[s,v[1]]}}}return false}}function k(r){return function(u){var v=u.length;for(var t=0,s=this.entries.length;t<s;++t){u[v+t]=this.entries[t][r]}}}d.prototype={getEqualityFunction:function(r){return(typeof r.equals==p)?g:e},getEntryForKey:o(j),getEntryAndIndexForKey:o(f),removeEntryForKey:function(s){var r=this.getEntryAndIndexForKey(s);if(r){n(this.entries,r[0]);return r[1]}return null},addEntry:function(r,s){this.entries[this.entries.length]=[r,s]},keys:k(0),values:k(1),getEntries:function(s){var u=s.length;for(var t=0,r=this.entries.length;t<r;++t){s[u+t]=this.entries[t].slice(0)}},containsKey:o(h),containsValue:function(s){var r=this.entries.length;while(r--){if(s===this.entries[r][1]){return true}}return false}};function m(s,t){var r=s.length,u;while(r--){u=s[r];if(t===u[0]){return r}}return null}function i(r,s){var t=r[s];return(t&&(t instanceof d))?t:null}function b(t,r){var w=this;var v=[];var u={};var x=(typeof t==p)?t:a;var s=(typeof r==p)?r:null;this.put=function(B,C){q(B);l(C);var D=x(B),E,A,z=null;E=i(u,D);if(E){A=E.getEntryForKey(B);if(A){z=A[1];A[1]=C}else{E.addEntry(B,C)}}else{E=new d(D,B,C,s);v[v.length]=E;u[D]=E}return z};this.get=function(A){q(A);var B=x(A);var C=i(u,B);if(C){var z=C.getEntryForKey(A);if(z){return z[1]}}return null};this.containsKey=function(A){q(A);var z=x(A);var B=i(u,z);return B?B.containsKey(A):false};this.containsValue=function(A){l(A);var z=v.length;while(z--){if(v[z].containsValue(A)){return true}}return false};this.clear=function(){v.length=0;u={}};this.isEmpty=function(){return !v.length};var y=function(z){return function(){var A=[],B=v.length;while(B--){v[B][z](A)}return A}};this.keys=y("keys");this.values=y("values");this.entries=y("getEntries");this.remove=function(B){q(B);var C=x(B),z,A=null;var D=i(u,C);if(D){A=D.removeEntryForKey(B);if(A!==null){if(!D.entries.length){z=m(v,C);n(v,z);delete u[C]}}}return A};this.size=function(){var A=0,z=v.length;while(z--){A+=v[z].entries.length}return A};this.each=function(C){var z=w.entries(),A=z.length,B;while(A--){B=z[A];C(B[0],B[1])}};this.putAll=function(H,C){var B=H.entries();var E,F,D,z,A=B.length;var G=(typeof C==p);while(A--){E=B[A];F=E[0];D=E[1];if(G&&(z=w.get(F))){D=C(F,z,D)}w.put(F,D)}};this.clone=function(){var z=new b(t,r);z.putAll(w);return z}}return b})();(function(b){b.fn.ooLog=function(f,d,e){var c=null;b(this).each(function(){c=b(this).data("_ooLog");if(c==undefined){c=new a();b(this).data("_ooLog",c)}});if(f==undefined){return c}else{if(typeof f==="string"){if(c){c.log(f,d,e)}}}};function a(){return this}a.prototype={isDebugEnabled:function(){return o_info.JSTracingLogDebugEnabled},log:function(e,c,d){if(!this.isDebugEnabled()){return}jQuery.post(o_info.JSTracingUri,{level:e,logMsg:c,jsFile:d})}}})(jQuery);(function(b){b.fn.ooTranslator=function(){var d=null;b(document).each(function(){d=b(document).data("_ooTranslator");if(d==undefined){d=new a();b(document).data("_ooTranslator",d)}});return d};function a(){return this}a.prototype={mapperUrl:null,translators:null,initialize:function(d){this.mapperUrl=d;this.translators=new Object()},getTranslator:function(d,f){if(this.translators[d]==null){this.translators[d]=new Object()}if(this.translators[d][f]==null){var e=this.mapperUrl+"/"+d+"/"+f+"/translations.js";jQuery.ajax(e,{async:false,dataType:"json",success:function(g,i,h){jQuery(document).ooTranslator()._createTranslator(g,d,f)}})}return this.translators[d][f]},_createTranslator:function(e,d,f){this.translators[d][f]=new c().initialize(e,d,f)}};function c(){return this}c.prototype={localizationData:null,bundle:null,locale:null,initialize:function(f,d,e){this.bundle=e;this.locale=d;this.localizationData=f;return this},translate:function(d){if(this.localizationData[d]){return this.localizationData[d]}else{return this.bundle+":"+d}}}})(jQuery);+function(b){var a=function(){this.addExtraElements();this.state={busy:false,brandW:0,sitesW:0,sitesDirty:false,sites:{collapsed:this.isSitesCollapsed(),extended:this.isSitesExtended},tabsW:0,tabsDirty:false,tabs:{collapsed:this.isTabsCollapsed(),extended:this.isTabsExtended()},toolsW:0,toolsDirty:false,tools:{collapsed:this.isToolsCollapsed(),extended:this.isToolsExtended()},offCanvasWidth:0,moreW:0};var c=b("#o_offcanvas_right").css("width");if(c){this.state.offCanvasWidth=parseInt(c.replace(/[^\d.]/g,""));this.initListners();this.calculateWidth();this.optimize()}};a.prototype.initListners=function(){b(window).resize(b.proxy(this.onResizeCallback,this));b(document).on("oo.nav.sites.modified",b.proxy(function(){this.state.sitesDirty=true},this));b(document).on("oo.nav.tabs.modified",b.proxy(function(){this.state.tabsDirty=true},this));b(document).on("oo.nav.tools.modified",b.proxy(function(){this.state.toolsDirty=true},this));b(document).on("oo.dom.replacement.after",b.proxy(this.onDOMreplacementCallback,this));b(window).on("orientationchange",b.proxy(this.hideRight,this));b("#o_navbar_right-toggle").on("click",b.proxy(this.toggleRight,this));b("#o_offcanvas_right .o_offcanvas_close").on("click",b.proxy(this.hideRight,this));b("#o_navbar_more").on("shown.bs.dropdown",this.onDropdownShown);b("#o_navbar_more").on("hidden.bs.dropdown",this.onDropdownHidden)};a.prototype.onResizeCallback=function(){if(!this.state.busy){this.state.busy=true;this.calculateWidth();this.optimize();this.state.busy=false}};a.prototype.onDOMreplacementCallback=function(){if(!this.state.busy&&(this.state.sitesDirty||this.state.tabsDirty||this.state.toolsDirty)){this.state.busy=true;this.cleanupMoreDropdown();this.calculateWidth();this.optimize();this.state.sitesDirty=false;this.state.tabsDirty=false;this.state.toolsDirty=false;this.state.busy=false}};a.prototype.onDropdownShown=function(c){var f=b("#o_navbar_more .dropdown-menu");if(f.length){var d=f.offset().left;if(d<0){f.removeClass("dropdown-menu-right")}}};a.prototype.onDropdownHidden=function(c){var d=b("#o_navbar_more .dropdown-menu");d.addClass("dropdown-menu-right")};a.prototype.calculateWidth=function(){var c=b("#o_navbar_container .o_navbar-collapse");this.state.navbarW=c.innerWidth();this.state.brandW=b(".o_navbar-brand").outerWidth(true);this.state.sitesW=this.getSites().outerWidth(true);this.state.tabsW=this.getTabs().outerWidth(true);this.state.toolsW=this.getTools().outerWidth(false);this.state.moreW=b("#o_navbar_more:visible").outerWidth(true)};a.prototype.getOverflow=function(c){var d=this.state.navbarW;d-=this.state.sitesW;d-=this.state.tabsW;d-=this.state.toolsW;d-=this.state.brandW;d-=this.state.moreW;d-=25;return -d};a.prototype.optimize=function(h){var c=this.getOverflow();var k=this.getSites();var l=this.getTabs();var g=this.getTools();var n=this.getMoreDropdown();var f=this.getOffcanvasRight();this.updateState();while(c>0&&(!this.state.tabs.collapsed||!this.state.sites.collapsed||!this.state.tools.collapsed)){if(!this.state.tabs.collapsed){this.collapse(l,n,"li","o_dropdown_tab")}else{if(!this.state.sites.collapsed){this.collapse(k,n,"li","o_dropdown_site")}else{if(!this.state.tools.collapsed){this.collapse(g,f,".o_navbar_tool:not(#o_navbar_imclient, #o_navbar_search_opener, #o_navbar_my_menu)","o_tool_right")}}}this.calculateWidth();c=this.getOverflow();this.updateState()}while(c<0&&(!this.state.tabs.extended||!this.state.sites.extended||!this.state.tools.extended)){if(!this.state.tools.extended){var m=this.extend(f,g.children("#o_navbar_imclient, #o_navbar_search_opener, #o_navbar_my_menu").first(),".o_tool_right","o_tool_right",true);if(!m){break}}if(!this.state.sites.extended){var j=this.extend(n,k,"li","o_dropdown_site");if(!j){break}}else{if(!this.state.tabs.extended){var d=this.extend(n,l,"li","o_dropdown_tab");if(!d){break}}}this.calculateWidth();c=this.getOverflow();this.updateState()}if(this.state.sites.extended&&this.state.tabs.extended){var i=b("#o_navbar_more");i.css("display","none")}this.checkToolsOrder()};a.prototype.updateState=function(){this.state.sites.collapsed=this.isSitesCollapsed();this.state.sites.extended=this.isSitesExtended();this.state.tabs.collapsed=this.isTabsCollapsed();this.state.tabs.extended=this.isTabsExtended();this.state.tools.collapsed=this.isToolsCollapsed();this.state.tools.extended=this.isToolsExtended()};a.prototype.collapse=function(g,d,c,f){var e=g.find(c);if(e.length){e=e.last()}if(e.length){f&&e.addClass(f);if(d){e.prependTo(d)}}this.updateDropdownToggle(g)};a.prototype.extend=function(g,d,c,i,f){var e=g.find(c);if(e.length){e=e.first()}var j=false;if(e.length){if(d&&d.length){if(f){d.before(e)}else{e.appendTo(d)}this.updateDropdownToggle(g);this.calculateWidth();var h=this.getOverflow();if(h>0){e.prependTo(g)}else{i&&e.removeClass(i);j=true}}}this.updateDropdownToggle(g);return j};a.prototype.updateDropdownToggle=function(c){var d=c.parents(".o_dropdown_toggle");if(!d.length){return}if(c.children().length){d.css("display","block")}else{d.css("display","none")}};a.prototype.addExtraElements=function(){var d=b("#o_navbar_container .o_navbar-collapse");var c=b("#o_navbar_more");if(c.length==0){c=b('<ul id="o_navbar_more" class="nav o_navbar-nav o_dropdown_toggle"><li><a class="dropdown-toggle" data-toggle="dropdown" href="#"">'+o_info.i18n_topnav_more+' <b class="caret"></b></a><ul class="dropdown-menu dropdown-menu-right"></ul></li></ul>');c.appendTo(d)}this.getSites().append('<li class="divider o_dropdown_site"></li>');b("#o_navbar_help .o_icon, #o_navbar_print .o_icon").addClass("o_icon-fw")};a.prototype.cleanupMoreDropdown=function(){if(!this.state.sitesDirty){var f=this.getSites();var d=this.getMoreDropdown().children(".o_dropdown_site");d.appendTo(f)}else{this.getSites().append('<li class="divider o_dropdown_site"></li>')}if(!this.state.tabsDirty){var e=this.getTabs();var c=this.getMoreDropdown().children(".o_dropdown_tab");c.prependTo(e)}this.getMoreDropdown().empty()};a.prototype.checkToolsOrder=function(){var f=this.getTools();var e=f.find("#o_navbar_help");var d=f.find("#o_navbar_print");var c=f.find("#o_navbar_imclient");if(c&&d){c.after(d)}if(c&&e){c.after(e)}};a.prototype.showRight=function(){if(!this.isOffcanvasVisible()&&!this.offcanvasTransitioning){this.offcanvasTransitioning=true;var d=this;var c=b("#o_offcanvas_right");c.show().transition({x:-d.state.offCanvasWidth},function(){d.offcanvasTransitioning=false;b("body").addClass("o_offcanvas_right_visible");var e=b.proxy(d.hideRightOnClick,d);setTimeout(function(){b("html").on("click",e)},10)})}};a.prototype.hideRightOnClick=function(c){if("INPUT"!=c.target.nodeName){this.hideRight()}};a.prototype.hideRight=function(){if(this.isOffcanvasVisible()&&!this.offcanvasTransitioning){this.offcanvasTransitioning=true;b("html").off("click",b.proxy(this.hideRight,this));var d=this;var c=b("#o_offcanvas_right");c.transition({x:d.state.offCanvasWidth},function(){d.offcanvasTransitioning=false;c.hide();b("body").removeClass("o_offcanvas_right_visible")})}};a.prototype.toggleRight=function(){if(this.isOffcanvasVisible()){this.hideRight()}else{this.showRight()}};a.prototype.isOffcanvasVisible=function(){return b("#o_offcanvas_right:visible").length};a.prototype.getSites=function(){return b("#o_navbar_container .o_navbar_sites")};a.prototype.getTabs=function(){return b("#o_navbar_container .o_navbar_tabs")};a.prototype.getTools=function(){return b("#o_navbar_container #o_navbar_tools_permanent")};a.prototype.getMoreDropdown=function(){return b("#o_navbar_more .dropdown-menu")};a.prototype.getOffcanvasRight=function(){return b("#o_offcanvas_right_container .o_navbar-right")};a.prototype.isSitesCollapsed=function(){return !this.getSites().children("li").not(".divider").length};a.prototype.isSitesExtended=function(){return !this.getMoreDropdown().children(".o_dropdown_site").not(".divider").length};a.prototype.isTabsCollapsed=function(){return !this.getTabs().children("li").length};a.prototype.isTabsExtended=function(){return !this.getMoreDropdown().children(".o_dropdown_tab").length};a.prototype.isToolsCollapsed=function(){return !this.getTools().children(".o_navbar_tool").not("#o_navbar_imclient, #o_navbar_search_opener, #o_navbar_my_menu").length};a.prototype.isToolsExtended=function(){return !this.getOffcanvasRight().children(".o_tool_right").length};b(document).ready(function(){var d=b("#o_navbar_wrapper");if(d){var c=new a();window.OPOL.navbar=c}})}(jQuery);+function(b){b.fn.ooBgCarrousel=function(){return new a()};var a=function(){};a.prototype.initCarrousel=function(g){this.settings=b.extend({query:null,images:[],shuffle:false,shuffleFirst:false,durationshow:5000,durationout:500,durationin:500,easeout:"ease",easein:"ease"},g);this.pos=null;if(this.settings.query==null||this.settings.images.length==0){return}this.initialImage=this.settings.images[0];if(this.settings.shuffle){var f=this.settings.images;for(var d,c,e=f.length;e;d=parseInt(Math.random()*e),c=f[--e],f[e]=f[d],f[d]=c){}}if(this.settings.shuffleFirst){this._replaceImage()}this.rotate()};a.prototype.rotate=function(){setTimeout(b.proxy(this._hideCurrent,this),this.settings.durationshow)};a.prototype._hideCurrent=function(){var c=b(this.settings.query);if(c&&c.size()>0){c.transition({opacity:0,duration:this.settings.durationout,easing:this.settings.easeout},b.proxy(this._showNext,this))}};a.prototype._replaceImage=function(d){if(!d){d=b(this.settings.query)}if(d&&d.size()>0){this.newImg="";this.oldImg="";if(this.pos==null){this.pos=1;this.oldImg=this.initialImage}else{this.oldImg=this.settings.images[this.pos];this.pos++;if(this.settings.images.length==this.pos){this.pos=0}}this.newImg=this.settings.images[this.pos];var c=d.css("background-image");if(c.indexOf(this.oldImg)==-1){d.transition({opacity:1,duration:0});return}var e=c.replace(this.oldImg,this.newImg);d.css("background-image",e)}};a.prototype._showNext=function(){var c=b(this.settings.query);this._replaceImage(c);c.transition({opacity:1,duration:this.settings.durationin,easing:this.settings.easein},b.proxy(this.rotate,this))}}(jQuery);!function(a){function b(){function b(a){"remove"===a&&this.each(function(a,b){var c=e(b);c&&c.remove()}),this.find("span.mceEditor,div.mceEditor").each(function(a,b){var c=tinymce.get(b.id.replace(/_parent$/,""));c&&c.remove()})}function d(a){var c,d=this;if(null!=a)b.call(d),d.each(function(b,c){var d;(d=tinymce.get(c.id))&&d.setContent(a)});else if(d.length>0&&(c=tinymce.get(d[0].id)))return c.getContent()}function e(a){var b=null;return a&&a.id&&g.tinymce&&(b=tinymce.get(a.id)),b}function f(a){return!!(a&&a.length&&g.tinymce&&a.is(":tinymce"))}var h={};a.each(["text","html","val"],function(b,g){var i=h[g]=a.fn[g],j="text"===g;a.fn[g]=function(b){var g=this;if(!f(g))return i.apply(g,arguments);if(b!==c)return d.call(g.filter(":tinymce"),b),i.apply(g.not(":tinymce"),arguments),g;var h="",k=arguments;return(j?g:g.eq(0)).each(function(b,c){var d=e(c);h+=d?j?d.getContent().replace(/<(?:"[^"]*"|'[^']*'|[^'">])*>/g,""):d.getContent({save:!0}):i.apply(a(c),k)}),h}}),a.each(["append","prepend"],function(b,d){var g=h[d]=a.fn[d],i="prepend"===d;a.fn[d]=function(a){var b=this;return f(b)?a!==c?("string"==typeof a&&b.filter(":tinymce").each(function(b,c){var d=e(c);d&&d.setContent(i?a+d.getContent():d.getContent()+a)}),g.apply(b.not(":tinymce"),arguments),b):void 0:g.apply(b,arguments)}}),a.each(["remove","replaceWith","replaceAll","empty"],function(c,d){var e=h[d]=a.fn[d];a.fn[d]=function(){return b.call(this,d),e.apply(this,arguments)}}),h.attr=a.fn.attr,a.fn.attr=function(b,g){var i=this,j=arguments;if(!b||"value"!==b||!f(i))return g!==c?h.attr.apply(i,j):h.attr.apply(i,j);if(g!==c)return d.call(i.filter(":tinymce"),g),h.attr.apply(i.not(":tinymce"),j),i;var k=i[0],l=e(k);return l?l.getContent({save:!0}):h.attr.apply(a(k),j)}}var c,d,e,f=[],g=window;a.fn.tinymce=function(c){function h(){var d=[],f=0;e||(b(),e=!0),l.each(function(a,b){var e,g=b.id,h=c.oninit;g||(b.id=g=tinymce.DOM.uniqueId()),tinymce.get(g)||(e=new tinymce.Editor(g,c,tinymce.EditorManager),d.push(e),e.on("init",function(){var a,b=h;l.css("visibility",""),h&&++f==d.length&&("string"==typeof b&&(a=-1===b.indexOf(".")?null:tinymce.resolve(b.replace(/\.\w+$/,"")),b=tinymce.resolve(b)),b.apply(a||tinymce,d))}))}),a.each(d,function(a,b){b.render()})}var i,j,k,l=this,m="";if(!l.length)return l;if(!c)return window.tinymce?tinymce.get(l[0].id):null;if(l.css("visibility","hidden"),g.tinymce||d||!(i=c.script_url))1===d?f.push(h):h();else{d=1,j=i.substring(0,i.lastIndexOf("/")),-1!=i.indexOf(".min")&&(m=".min"),g.tinymce=g.tinyMCEPreInit||{base:j,suffix:m},-1!=i.indexOf("gzip")&&(k=c.language||"en",i=i+(/\?/.test(i)?"&":"?")+"js=true&core=true&suffix="+escape(m)+"&themes="+escape(c.theme||"modern")+"&plugins="+escape(c.plugins||"")+"&languages="+(k||""),g.tinyMCE_GZ||(g.tinyMCE_GZ={start:function(){function b(a){tinymce.ScriptLoader.markDone(tinymce.baseURI.toAbsolute(a))}b("langs/"+k+".js"),b("themes/"+c.theme+"/theme"+m+".js"),b("themes/"+c.theme+"/langs/"+k+".js"),a.each(c.plugins.split(","),function(a,c){c&&(b("plugins/"+c+"/plugin"+m+".js"),b("plugins/"+c+"/langs/"+k+".js"))})},end:function(){}}));var n=document.createElement("script");n.type="text/javascript",n.onload=n.onreadystatechange=function(b){b=b||window.event,2===d||"load"!=b.type&&!/complete|loaded/.test(n.readyState)||(tinymce.dom.Event.domLoaded=1,d=2,c.script_loaded&&c.script_loaded(),h(),a.each(f,function(a,b){b()}))},n.src=i,document.body.appendChild(n)}return l},a.extend(a.expr[":"],{tinymce:function(a){var b;return a.id&&"tinymce"in window&&(b=tinymce.get(a.id),b&&b.editorManager===tinymce)?!0:!1}})}(jQuery);OPOL={};var o2c=0;var o3c=new Array();o_info.guibusy=false;o_info.linkbusy=false;o_info.debug=true;var BLoader={_ajaxLoadedJS:new Array(),_isAlreadyLoadedJS:function(b){var a=true;jQuery("head script[src]").each(function(d,c){if(jQuery(c).attr("src").indexOf(b)!=-1){a=false}});if(jQuery.inArray(b,this._ajaxLoadedJS)!=-1){a=false}return !a},loadJS:function(b,c,a){if(!this._isAlreadyLoadedJS(b)){if(o_info.debug){o_log("BLoader::loadJS: loading ajax::"+a+" url::"+b)}if(a){jQuery.ajax(b,{async:false,dataType:"script",cache:true,success:function(d,f,e){}});this._ajaxLoadedJS.push(b)}else{jQuery.getScript(b)}if(o_info.debug){o_log("BLoader::loadJS: loading DONE url::"+b)}}else{if(o_info.debug){o_log("BLoader::loadJS: already loaded url::"+b)}}},executeGlobalJS:function(jsString,contextDesc){try{if(window.execScript){window.execScript(jsString)}else{window.eval(jsString)}}catch(e){if(window.console){console.log(contextDesc,"cannot execute js",jsString)}if(o_info.debug){o_logerr("BLoader::executeGlobalJS: Error when executing JS code in contextDesc::"+contextDesc+' error::"'+showerror(e)+" for: "+escape(jsString))}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","BLoader::executeGlobalJS: Error when executing JS code in contextDesc::"+contextDesc+' error::"'+showerror(e)+" for: "+escape(jsString),"functions.js::BLoader::executeGlobalJS::"+contextDesc)}if(window.location.href.indexOf("o_winrndo")!=-1){window.location.reload()}else{window.location.href=window.location.href+(window.location.href.indexOf("?")!=-1?"&":"?")+"o_winrndo=1"}}},loadCSS:function(b,o,q){var r=window.document;try{if(r.createStyleSheet){var j=r.styleSheets;var d=0;var p=0;for(i=0;i<j.length;i++){var m=j[i];var g=m.href;if(g==b){d++;if(m.disabled){m.disabled=false;return}else{if(o_info.debug){o_logwarn("BLoader::loadCSS: style: "+b+" already in document and not disabled! (duplicate add)")}return}}if(m.id=="o_theme_css"){p=i}}if(d>1&&o_info.debug){o_logwarn("BLoader::loadCSS: apply styles: num of stylesheets found was not 0 or 1:"+d)}if(q){p=j.length}var f=r.createStyleSheet(b,p)}else{var c=jQuery("#"+o);if(c&&c.size()>0){if(o_info.debug){o_logwarn("BLoader::loadCSS: stylesheet already found in doc when trying to add:"+b+", with id "+o)}return}else{var a=jQuery('<link id="'+o+'" rel="stylesheet" type="text/css" href="'+b+'">');if(q){a.insertBefore(jQuery("#o_fontSize_css"))}else{a.insertBefore(jQuery("#o_theme_css"))}}}}catch(n){if(window.console){console.log(n)}if(o_info.debug){o_logerr("BLoader::loadCSS: Error when loading CSS from URL::"+b)}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","BLoader::loadCSS: Error when loading CSS from URL::"+b,"functions.js::BLoader::loadCSS")}}},unLoadCSS:function(a,m){var n=window.document;try{if(n.createStyleSheet){var f=n.styleSheets;var d=0;var o=a;var b=window.location.href.substring(0,window.location.href.indexOf("/",8));if(a.indexOf(b)==0){o=a.substring(b.length)}for(i=0;i<f.length;i++){var g=f[i].href;if(g==a||g==o){d++;if(!f[i].disabled){f[i].disabled=true}else{if(o_info.debug){o_logwarn("stylesheet: when removing: matching url, but already disabled! url:"+g)}}}}if(d!=1&&o_info.debug){o_logwarn("stylesheet: when removeing: num of stylesheets found was not 1:"+d)}}else{var c=jQuery("#"+m);if(c){c.href="";c.remove();c=null;return}else{if(o_info.debug){o_logwarn("no link with id found to remove, id:"+m+", url "+a)}}}}catch(j){if(o_info.debug){o_logerr("BLoader::unLoadCSS: Error when unloading CSS from URL::"+a)}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","BLoader::unLoadCSS: Error when unloading CSS from URL::"+a,"functions.js::BLoader::loadCSS")}}}};var BFormatter={formatLatexFormulas:function(b){try{if(window.jsMath){if(jsMath.loaded&&jsMath.tex2math&&jsMath.tex2math.loaded){jsMath.Process()}else{jsMath.Autoload.LoadJsMath();setTimeout(function(){BFormatter.formatLatexFormulas(b)},100)}}}catch(a){if(window.console){console.log("error in BFormatter.formatLatexFormulas: ",a)}}}};function o_init(){try{o_getMainWin().o_afterserver()}catch(a){if(o_info.debug){o_log("error in o_init: "+showerror(a))}}}function o_initEmPxFactor(){o_info.emPxFactor=jQuery("#o_width_1em").width();if(o_info.emPxFactor==0||o_info.emPxFactor=="undefined"){o_info.emPxFactor=12;if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Could not read with of element b_width_1em, set o_info.emPxFactor to 12","functions.js")}}}function o_getMainWin(){try{if(window.OPOL){return window}else{if(window.opener&&window.opener.OPOL){return window.opener}}}catch(a){if(o_info.debug){o_logerr('Exception while getting main window. rror::"'+showerror(a))}if(window.console){console.log('Exception while getting main window. rror::"'+showerror(a),"functions.js");console.log(a)}}throw"Can not find main OpenOLAT window"}function o_beforeserver(){o_info.linkbusy=true;showAjaxBusy();if(window.suppressOlatOnUnloadOnce){window.suppressOlatOnUnloadOnce=false}else{if(window.olatonunload){olatonunload()}}}function o_afterserver(){o2c=0;o_info.linkbusy=false;removeAjaxBusy()}function o2cl(){try{if(o_info.linkbusy){return false}else{var b=(o2c==0||confirm(o_info.dirty_form));if(b){o_beforeserver()}return b}}catch(a){if(window.console){console.log(a)}return false}}function o2cl_noDirtyCheck(){if(o_info.linkbusy){return false}else{o_beforeserver();return true}}function o3cl(d){if(o_info.linkbusy){return false}else{var b=o3c1.indexOf(d)>-1;var a=(b&&o3c1.length>1)||o3c1.length>0;var c=(!a||confirm(o_info.dirty_form));if(c){o_beforeserver()}return c}}function o_onc(a){var b=a.responseText;BLoader.executeGlobalJS("o_info.last_o_onc="+b+";","o_onc");o_ainvoke(o_info.last_o_onc,false)}function o_allowNextClick(){o_info.linkbusy=false;removeAjaxBusy()}function removeBusyAfterDownload(c,b,a){o2c=0;o_afterserver()}Array.prototype.search=function(c,d){var a=this.length;for(var b=0;b<a;b++){if(this[b].constructor==Array){if(this[b].search(c,d)){return true;break}}else{if(d){if(this[b].indexOf(c)!=-1){return true;break}}else{if(this[b]==c){return true;break}}}}return false};if(!Function.prototype.curry){Function.prototype.curry=function(){if(arguments.length<1){return this}var a=this;var b=Array.prototype.slice.call(arguments);return function(){return a.apply(this,b.concat(Array.prototype.slice.call(arguments)))}}}if(!Array.prototype.indexOf){Array.prototype.indexOf=function(c){if(this==null){throw new TypeError()}var d=Object(this);var a=d.length>>>0;if(a===0){return -1}var e=0;if(arguments.length>1){e=Number(arguments[1]);if(e!=e){e=0}else{if(e!=0&&e!=Infinity&&e!=-Infinity){e=(e>0||-1)*Math.floor(Math.abs(e))}}}if(e>=a){return -1}var b=e>=0?e:Math.max(a-Math.abs(e),0);for(;b<a;b++){if(b in d&&d[b]===c){return b}}return -1}}var b_onDomReplacementFinished_callbacks=new Array();function b_AddOnDomReplacementFinishedCallback(a){var b=jQuery(document).ooLog().isDebugEnabled();if(b){jQuery(document).ooLog("debug","callback stack size: "+b_onDomReplacementFinished_callbacks.length,"functions.js ADD")}if(b&&b_onDomReplacementFinished_callbacks.toSource){jQuery(document).ooLog("debug","stack content"+b_onDomReplacementFinished_callbacks.toSource(),"functions.js ADD")}b_onDomReplacementFinished_callbacks.push(a);if(b){jQuery(document).ooLog("debug","push to callback stack, func: "+a,"functions.js ADD")}}var b_changedDomEl=new Array();function b_AddOnDomReplacementFinishedUniqueCallback(a){if(a.constructor==Array){if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","add: its an ARRAY! ","functions.js ADD")}if(b_onDomReplacementFinished_callbacks.search(a[0])){if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","push to callback stack, already there!!: "+a[0],"functions.js ADD")}return}}b_AddOnDomReplacementFinishedCallback(a)}var o_debug_trid=0;function o_ainvoke(N){if(N==undefined){return}o_info.inainvoke=true;var I=N.cmdcnt;if(I>0){jQuery(document).trigger("oo.dom.replacement.before");b_changedDomEl=new Array();if(o_info.debug){o_debug_trid++}var y=N.cmds;for(var T=0;T<I;T++){var J=y[T];var A=J.cmd;var R=J.cda;var U=J.w;var c=this.window;var K;if(c){switch(A){case 1:var M=R.e;BLoader.executeGlobalJS(M,"o_ainvoker::jsexec");if(o_info.debug){o_log("c1: execute jscode: "+M)}case 2:var u=R.cc;var F=R.cps;for(var Q=0;Q<u;Q++){var m=F[Q];var h=m.cid;var P=m.cidvis;var H=m.cw;var x=m.hfrag;var O=m.jsol;var g=m.hdr;if(o_info.debug){o_log("c2: redraw: "+m.cname+" ("+h+") "+m.hfragsize+" bytes, listener(s): "+m.clisteners)}var W=g+"\n\n"+x;var C="";var S=false;var E="o_c"+h;var B=jQuery("#"+E);if(B==null||B.length==0){E="o_fi"+h;B=jQuery("#"+E);S=true}if(B!=null){var w=jQuery("div.o_richtext_mce textarea",B);for(var L=0;L<w.length;L++){try{var a=jQuery(w.get(L)).attr("id");if(typeof top.tinymce!=undefined){top.tinymce.remove("#"+a)}}catch(Z){if(window.console){console.log(Z)}}}if(P){B.css("display","")}else{B.css("display","none")}if(S||!H){B.replaceWith(W)}else{try{B.empty().html(W);if(W.length>0&&B.get(0).innerHTML==""){B.get(0).innerHTML=W}}catch(Z){if(window.console){console.log(Z)}if(window.console){console.log("Fragment",W)}}b_changedDomEl.push(E)}B=null;if(C!=""){C.each(function(e){BLoader.executeGlobalJS(e,"o_ainvoker::inscripts")})}if(O!=""){BLoader.executeGlobalJS(O,"o_ainvoker::jsol")}}}break;case 3:c.o2c=0;var X=R.rurl;c.o_afterserver();c.document.location.replace(X);break;case 5:c.o2c=0;var X=R.rurl;c.o_afterserver();c.document.location.replace(X);break;case 6:c.o2c=0;c.o_afterserver();break;case 7:var o=c.document.location;var z=o.protocol+"//"+o.hostname;if(o.port!=""){z+=":"+o.port}var v=R.cssrm;for(Q=0;Q<v.length;Q++){var D=v[Q];var G=D.id;var f=z+D.url;BLoader.unLoadCSS(f,G);if(o_info.debug){o_log("c7: rm css: id:"+G+" ,url:'"+f+"'")}}var V=R.cssadd;for(k=0;k<V.length;k++){var D=V[k];var G=D.id;var f=z+D.url;var n=D.pt;BLoader.loadCSS(f,G,n);if(o_info.debug){o_log("c7: add css: id:"+G+" ,url:'"+f+"'")}}var p=R.jsadd;for(l=0;l<p.length;l++){var D=p[l];var Y=D.before;if(jQuery.type(Y)==="string"){BLoader.executeGlobalJS(Y,"o_ainvoker::preJsAdd")}var f=D.url;var q=D.enc;if(jQuery.type(f)==="string"){BLoader.loadJS(f,q,true)}if(o_info.debug){o_log("c7: add js: "+f)}}break;default:if(o_info.debug){o_log("?: unknown command "+A)}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Error in o_ainvoke(), ?: unknown command "+A,"functions.js")}break}}else{if(o_info.debug){o_log("could not find window??")}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Error in o_ainvoke(), could not find window??","functions.js")}}}var b=b_onDomReplacementFinished_callbacks.length;if(b_onDomReplacementFinished_callbacks.toSource&&jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","stack content"+b_onDomReplacementFinished_callbacks.toSource(),"functions.js")}for(mycounter=0;b>mycounter;mycounter++){if(mycounter>50){if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Stopped executing DOM replacement callback functions - to many functions::"+b_onDomReplacementFinished_callbacks.length,"functions.js")}break}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Stacksize before shift: "+b_onDomReplacementFinished_callbacks.length,"functions.js")}var s=b_onDomReplacementFinished_callbacks.shift();if(typeof s.length==="number"){if(s[0]=="glosshighlighter"){var d=s[1];if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","arr fct: "+d,"functions.js")}s=d}}if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Executing DOM replacement callback function #"+mycounter+" with timeout funct::"+s,"functions.js")}s();if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Stacksize after timeout: "+b_onDomReplacementFinished_callbacks.length,"functions.js")}}jQuery(document).trigger("oo.dom.replacement.after")}o_info.inainvoke=false}function clearAfterAjaxIframeCall(){if(o_info.linkbusy){o_afterserver()}}function showAjaxBusy(){setTimeout(function(){if(o_info.linkbusy){try{if(jQuery("#o_ajax_busy_backdrop").length==0){jQuery("#o_body").addClass("o_ajax_busy");jQuery("#o_ajax_busy").modal({show:true,backdrop:"static",keyboard:"false"});jQuery("#o_ajax_busy").after('<div id="o_ajax_busy_backdrop" class="modal-backdrop in"></div>');jQuery("#o_ajax_busy>.modal-backdrop").remove();jQuery("#o_ajax_busy_backdrop").css({"z-index":1200})}}catch(a){if(window.console){console.log(a)}}}},700)}function removeAjaxBusy(){try{jQuery("#o_body").removeClass("o_ajax_busy");jQuery("#o_ajax_busy_backdrop").remove();jQuery("#o_ajax_busy").modal("hide")}catch(a){if(window.console){console.log(a)}}}function setFormDirty(c){o2c=1;var a=document.getElementById(c);if(a!=null){var b=a.olat_fosm_0;if(b==null){b=a.olat_fosm}if(b){b.className="btn o_button_dirty"}}else{if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Error in setFormDirty, myForm was null for formId="+c,"functions.js")}}}function contextHelpWindow(a){helpWindow=window.open(a,"HelpWindow","height=760, width=940, left=0, top=0, location=no, menubar=no, resizable=yes, scrollbars=yes, toolbar=no");helpWindow.focus()}function o_openPopUp(b,d,c,a,e){attributes="height="+a+", width="+c+", resizable=yes, scrollbars=yes, left=100, top=100, ";if(e){attributes+="location=yes, menubar=yes, status=yes, toolbar=yes"}else{attributes+="location=no, menubar=no, status=no, toolbar=no"}var f=window.open(b,d,attributes);f.focus();if(o_info.linkbusy){o_afterserver()}}function b_handleFileUploadFormChange(e,b,d){var f=e.value;slashPos=f.lastIndexOf("/");if(slashPos!=-1){f=f.substring(slashPos+1)}slashPos=f.lastIndexOf("\\");if(slashPos!=-1){f=f.substring(slashPos+1)}b.value=f;if(d){d.className="o_button_dirty"}var c=e.form.elements;for(i=0;i<c.length;i++){var a=c[i];if(a.name==b.name&&i+1<c.length){c[i+1].focus()}}}function gotonode(a){try{if(typeof o_activateCourseNode!="undefined"){o_activateCourseNode(a)}else{if(opener&&typeof opener.o_activateCourseNode!="undefined"){opener.o_activateCourseNode(a)}else{if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Error in gotonode(), could not find main window","functions.js")}}}}catch(b){alert("Goto node error:"+b);if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Error in gotonode()::"+b.message,"functions.js")}}}function o_viewportHeight(){var a=jQuery(document).height();if(a>0){return a}else{return 600}}OPOL.getMainColumnsMaxHeight=function(){var j=0,f=0,a=0,c=0,h=0,b,g=jQuery("#o_main_left_content"),e=jQuery("#o_main_right_content"),d=jQuery("#o_main_center_content");if(g!="undefined"&&g!=null){j=g.outerHeight(true)}if(e!="undefined"&&e!=null){f=e.outerHeight(true)}if(d!="undefined"&&d!=null){a=d.outerHeight(true)}c=(j>f?j:f);c=(c>a?c:a);if(c>0){return c}b=jQuery("#o_main");if(b!="undefined"&&b!=null){h=b.height()}if(b>0){return b}return o_viewportHeight()};OPOL.adjustHeight=function(){try{var a=0;col1=jQuery("#o_main_left_content").outerHeight(true);col2=jQuery("#o_main_right_content").outerHeight(true);col3=jQuery("#o_main_center_content").outerHeight(true);a=Math.max(col1,col2,col3);if(col1!=null){jQuery("#o_main_left").css({"min-height":a+"px"})}if(col2!=null){jQuery("#o_main_right").css({"min-height":a+"px"})}if(col3!=null){jQuery("#o_main_center").css({"min-height":a+"px"})}}catch(b){if(window.console){console.log(b)}}};jQuery(window).resize(function(){clearTimeout(o_info.resizeId);o_info.resizeId=setTimeout(function(){jQuery(document).trigger("oo.window.resize.after")},500)});jQuery(document).on("oo.window.resize.after",OPOL.adjustHeight);jQuery(document).on("oo.dom.replacement.after",OPOL.adjustHeight);jQuery().ready(OPOL.adjustHeight);function o_scrollToElement(a){try{jQuery("html, body").animate({scrollTop:jQuery(a).offset().top},333)}catch(b){}}function o_popover(c,b,a){if(typeof(a)==="undefined"){a="bottom"}jQuery("#"+c).popover({placement:a,html:true,trigger:"click",container:"body",content:function(){return jQuery("#"+b).clone().html()}}).on("shown.bs.popover",function(){var d=function(f){jQuery("#"+c).popover("hide");jQuery("body").unbind("click",d)};setTimeout(function(){jQuery("body").on("click",d)},5)})}function o_popoverWithTitle(d,c,b,a){if(typeof(a)==="undefined"){a="bottom"}return jQuery("#"+d).popover({placement:a,html:true,title:b,trigger:"click",container:"body",content:function(){return jQuery("#"+c).clone().html()}}).on("shown.bs.popover",function(){var e=function(f){jQuery("#"+d).popover("destroy");jQuery("body").unbind("click",e)};setTimeout(function(){jQuery("body").on("click",e)},5)})}function o_shareLinkPopup(d,c,b){if(typeof(b)==="undefined"){b="top"}var a=jQuery("#"+d);a.popover({placement:b,html:true,trigger:"click",container:"body",content:c}).on("shown.bs.popover",function(){var e=function(f){if(jQuery(f.target).data("toggle")!=="popover"&&jQuery(f.target).parents(".popover.in").length===0){jQuery("#"+d).popover("hide");jQuery("body").unbind("click",e)}};setTimeout(function(){jQuery("body").on("click",e)},5)});a.attr("title",a.attr("data-original-title"))}function o_QRCodePopup(d,c,b){if(typeof(b)==="undefined"){b="top"}var a=jQuery("#"+d);a.popover({placement:b,html:true,trigger:"click",container:"body",content:'<div id="'+d+'_pop" class="o_qrcode"></div>'}).on("shown.bs.popover",function(){o_info.qr=o_QRCode(d+"_pop",(jQuery.isFunction(c)?c():c));var e=function(f){if(jQuery(f.target).data("toggle")!=="popover"&&jQuery(f.target).parents(".popover.in").length===0){jQuery("#"+d).popover("hide");jQuery("body").unbind("click",e)}};setTimeout(function(){jQuery("body").on("click",e)},5)}).on("hidden.bs.popover",function(){try{o_info.qr.clear();delete o_info.qr}catch(f){}});a.attr("title",a.attr("data-original-title"))}function o_QRCode(c,b){try{BLoader.loadJS(o_info.o_baseURI+"/js/jquery/qrcodejs/qrcode.min.js","utf8",true);return new QRCode(document.getElementById(c),b)}catch(a){return null}}function b_resizeIframeToMainMaxHeight(f){var d=jQuery("#"+f);if(d!="undefined"&&d!=null){var c=OPOL.getMainColumnsMaxHeight()-110;var b=o_viewportHeight()-100;b=b-d.offset().top;var e=jQuery("#b_footer");if(e!="undefined"&&e!=null){b=b-e.outerHeight(true)}var a=(b>c?b:c);d.height(a)}}var o_debu_oldcn,o_debu_oldtt;function o_debu_show(b,a){if(o_debu_oldcn){o_debu_hide(o_debu_oldcn,o_debu_oldtt)}jQuery(b).addClass("o_dev_m");jQuery(a).show();o_debu_oldtt=a;o_debu_oldcn=b}function o_debu_hide(b,a){jQuery(a).hide();jQuery(b).removeClass("o_dev_m")}function o_dbg_mark(a){var b=jQuery("#"+a);if(b){b.css("background-color","#FCFCB8");b.css("border","3px solid #00F")}}function o_dbg_unmark(a){var b=jQuery("#"+a);if(b){b.css("border","");b.css("background-color","")}}function o_clearConsole(){o_log_all="";o_log(null)}var o_log_all="";function o_log(b){if(b){o_log_all="\n"+o_debug_trid+"> "+b+o_log_all;o_log_all=o_log_all.substr(0,4000)}var a=jQuery("#o_debug_cons");if(a){if(o_log_all.length==4000){o_log_all=o_log_all+"\n... (stripped: to long)... "}a.value=o_log_all}if(!jQuery.type(window.console)==="undefined"){window.console.log(b)}}function o_logerr(a){o_log("ERROR:"+a)}function o_logwarn(a){o_log("WARN:"+a)}function showerror(c){var a="";for(var b in c){a+=b+": "+c[b]+"\n"}return"error detail:\n"+a}function o_ffEvent(f,e,d,m,n){var g,h,b,a;g=document.getElementById(e);h=g.value;g.value=d;b=document.getElementById(m);a=b.value;b.value=n;var c=jQuery("#"+f);var j=c.attr("enctype");if(j&&j.indexOf("multipart")==0){o_XHRSubmitMultipart(f)}else{if(document.forms[f].onsubmit()){document.forms[f].submit()}}g.value=h;b.value=a}function o_IQEvent(a){if(document.forms[a].onsubmit()){document.forms[a].submit()}}function o_TableMultiActionEvent(a,c){var b=jQuery("#o_mai_"+a);b.val(c);if(document.forms[a].onsubmit()){document.forms[a].submit()}b.val("")}function o_XHRSubmit(h){if(o_info.linkbusy){return false}o_beforeserver();var n=true;var a=jQuery("#"+h);var m=a.attr("enctype");if(m&&m.indexOf("multipart")==0){var g="openolat-submit-"+(""+Math.random()).substr(2);var d=o_createIFrame(g);document.body.appendChild(d);a.attr("target",d.name);return true}else{var f=a.serializeArray();if(arguments.length>1){var j=arguments.length;for(var e=1;e<j;e=e+2){if(j>e+1){var c=new Object();c.name=arguments[e];c.value=arguments[e+1];f[f.length]=c}}}var b=a.attr("action");jQuery.ajax(b,{type:"POST",data:f,cache:false,dataType:"json",success:function(r,u,q){try{o_ainvoke(r);if(n){var o=r.businessPath;var p=r.documentTitle;var t=r.historyPointId;if(o){o_pushState(t,p,o)}}}catch(s){if(window.console){console.log(s)}}finally{o_afterserver()}},error:o_onXHRError});return false}}function o_XHRSubmitMultipart(a){var c=jQuery("#"+a);var d="openolat-submit-"+(""+Math.random()).substr(2);var b=o_createIFrame(d);document.body.appendChild(b);c.attr("target",b.name);c.submit();c.attr("target","")}function o_createIFrame(b){var a=jQuery('<iframe name="'+b+'" id="'+b+'" src="about:blank" style="position: absolute; top: -9999px; left: -9999px;"></iframe>');return a[0]}function o_removeIframe(a){jQuery("#"+a).remove()}function o_ffXHREvent(f,e,a,h,m,n,j){if(n){if(!o2cl()){return false}}else{if(!o2cl_noDirtyCheck()){return false}}var d=new Object();d.dispatchuri=a;d.dispatchevent=m;if(arguments.length>7){var g=arguments.length;for(var c=7;c<g;c=c+2){if(g>c+1){d[arguments[c]]=arguments[c+1]}}}var b=jQuery("#"+f).attr("action");jQuery.ajax(b,{type:"POST",data:d,cache:false,dataType:"json",success:function(r,u,q){try{o_ainvoke(r);if(j){var o=r.businessPath;var p=r.documentTitle;var t=r.historyPointId;if(o){o_pushState(t,p,o)}}}catch(s){if(window.console){console.log(s)}}finally{o_afterserver()}},error:o_onXHRError})}function o_XHREvent(f,d,a){if(d){if(!o2cl()){return false}}else{if(!o2cl_noDirtyCheck()){return false}}var c=new Object();if(arguments.length>3){var e=arguments.length;for(var b=3;b<e;b=b+2){if(e>b+1){c[arguments[b]]=arguments[b+1]}}}jQuery.ajax(f,{type:"POST",data:c,cache:false,dataType:"json",success:function(m,p,j){try{o_ainvoke(m);if(a){var g=m.businessPath;var h=m.documentTitle;var o=m.historyPointId;if(g){o_pushState(o,h,g)}}}catch(n){if(window.console){console.log(n)}}finally{o_afterserver()}},error:o_onXHRError});return false}function o_XHRNFEvent(d){var b=new Object();if(arguments.length>1){var c=arguments.length;for(var a=1;a<c;a=a+2){if(c>a+1){b[arguments[a]]=arguments[a+1]}}}jQuery.ajax(d,{type:"POST",data:b,cache:false,dataType:"json",success:function(f,g,e){},error:function(e,g,f){if(window.console){console.log("Error status",g)}}})}function o_onXHRError(a,d,b){o_afterserver();if(401==a.status){var c=o_info.oo_noresponse.replace("reload.html",window.document.location.href);showMessageBox("error",o_info.oo_noresponse_title,c,undefined)}else{if(window.console){console.log("Error status",d,b,a.responseText)}}}function o_pushState(d,f,a){try{var b=new Object();b.businessPath=a;b.historyPointId=d;if(a!=null&&!(a.lastIndexOf("http",0)===0)&&!(a.lastIndexOf("https",0)===0)){a=o_info.serverUri+a}o_info.businessPath=a;o_shareActiveSocialUrl();if(window.history&&!(typeof window.history==="undefined")&&window.history.pushState){window.history.pushState(b,f,a)}else{window.location.hash=d}}catch(c){if(window.console){console.log(c,a)}}}function setFlexiFormDirtyByListener(a){setFlexiFormDirty(a.data.formId)}function setFlexiFormDirty(b){var a=o3c.indexOf(b)>-1;if(!a){o3c.push(b)}jQuery("#"+b).each(function(){var c=jQuery(this).data("FlexiSubmit");if(c!=null){jQuery("#"+c).addClass("btn o_button_dirty");o2c=1}})}function o_ffRegisterSubmit(b,a){jQuery("#"+b).data("FlexiSubmit",a)}function showInfoBox(g,d){var c=Math.floor(Math.random()*65536).toString(16);var f='<div id="'+c+'" class="o_alert_info "><div class="alert alert-info clearfix o_sel_info_message"><i class="o_icon o_icon_close"></i><h3><i class="o_icon o_icon_info"></i> '+g+"</h3><p>"+d+"</p></div></div>";var a=jQuery("#o_messages").prepend(f);var e=(d.length>150)?8000:((d.length>70)?6000:4000);var b=function(){jQuery("#"+c).transition({top:"-100%"},333,function(){jQuery("#"+c).remove()})};jQuery("#"+c).show().transition({top:0},333);jQuery("#"+c).click(function(h){b()});o_scrollToElement("#o_top");g=null;d=null;a=null;e=null;setTimeout(function(){try{b()}catch(h){}},8000)}function showMessageBox(b,f,d,a){if(b=="info"){showInfoBox(f,d);return null}else{var c='<div id="myFunctionalModal" class="modal fade" role="dialog"><div class="modal-dialog"><div class="modal-content">';c+='<div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>';c+='<h4 class="modal-title">'+f+"</h4></div>";c+='<div class="modal-body alert ';if("warn"==b){c+="alert-warning"}else{if("error"==b){c+="alert-danger"}else{c+="alert-info"}}c+='"><p>'+d+"</p></div></div></div></div>";jQuery("#myFunctionalModal").remove();jQuery("body").append(c);var e=jQuery("#myFunctionalModal").modal("show").on("hidden.bs.modal",function(g){jQuery("#myFunctionalModal").remove()});o_scrollToElement("#o_top");return e}}function o_table_toggleCheck(d,c){var a=document.forms[d].elements.tb_ms;len=a.length;if(typeof(len)=="undefined"){a.checked=c}else{var b;for(b=0;b<len;b++){a[b].checked=c}}}function onTreeStartDrag(a,b){jQuery(a.target).addClass("o_dnd_proxy")}function onTreeStopDrag(a,b){jQuery(a.target).removeClass("o_dnd_proxy")}function onTreeDrop(g,h){var a=jQuery(h.draggable[0]);var f=jQuery(this);f.css({position:"",width:""});var c=f.droppable("option","endUrl");if(c.lastIndexOf("/")==(c.length-1)){c=c.substring(0,c.length-1)}var e=a.attr("id");var b=e.substring(2,e.length);c+="%3Atnidle%3A"+b;var d=f.attr("id");if(d.indexOf("ds")==0){c+="%3Asne%3Ayes"}else{if(d.indexOf("dt")==0){c+="%3Asne%3Aend"}}jQuery(".ui-droppable").each(function(j,m){jQuery(m).droppable("disable")});o_XHREvent(c+"/",false,false)}function treeAcceptDrop(a){return true}function treeAcceptDrop_notWithChildren(a){var c=false;var b=jQuery(a);var e=b.attr("id");if(e!=undefined&&(e.indexOf("dd")==0||e.indexOf("ds")==0||e.indexOf("dt")==0||e.indexOf("da")==0||e.indexOf("row")==0)){var g=jQuery(this);var j=g.attr("id");var d=e.substring(2,e.length);var f=j.substring(2,j.length);if(d!=f){var h=jQuery("#dd"+d).parents("li");if(h.length>0&&jQuery(h.get(0)).find("#dd"+f).length==0){c=true}}}return c}function treeAcceptDrop_portfolio(b){var d=false;var c=jQuery(b);var f=c.attr("id");if(treeNode_isDragNode(f)){var h=jQuery(this);var n=h.attr("id");var e=f.substring(2,f.length);var g=n.substring(2,n.length);var m=f.indexOf("ds")==0||f.indexOf("dt")==0;if(e!=g){var j=treeNode_portfolioType(c);var a=treeNode_portfolioType(h);if(j=="artefact"){if(a=="page"||a=="struct"||a=="artefact"){d=true}}else{if(j=="struct"){if(a=="page"||a=="struct"){d=true}}else{if(j=="page"){if(a=="map"||a=="page"){d=true}}}}}}return d}function treeNode_portfolioType(e){var c=jQuery(e.get(0));var d=treeNode_portfolioTypes(c);if(d==null){var a=c.parent("a");if(a.length>0){d=treeNode_portfolioTypes(jQuery(a.get(0)))}else{if(c.attr("id").indexOf("ds")==0){var b=c.prev("div");if(b.length>0){d=treeNode_portfolioTypes(b)}}else{if(c.attr("id").indexOf("dt")==0){var b=c.next("div");if(b.length>0){d=treeNode_portfolioTypes(b)}}}}}return d}function treeNode_portfolioTypes(a){if(a.find===undefined){return null}else{if(a.find(".o_ep_icon_struct").length>0||a.hasClass("o_ep_icon_struct")){return"struct"}else{if(a.find(".o_ep_icon_page").length>0||a.hasClass("o_ep_icon_page")){return"page"}else{if(a.find(".o_ep_icon_map").length>0||a.hasClass("o_ep_icon_map")){return"map"}else{if(a.find(".o_ep_artefact").length>0||a.hasClass("o_ep_artefact")){return"artefact"}}}}}return null}function treeNode_isDragNode(a){if(a!=undefined&&(a.indexOf("dd")==0||a.indexOf("ds")==0||a.indexOf("dt")==0||a.indexOf("da")==0||a.indexOf("row")==0)){return true}return false}function o_choice_toggleCheck(c,b){var d=document.forms[c].elements;len=d.length;if(typeof(len)=="undefined"){d.checked=b}else{var a;for(a=0;a<len;a++){if(d[a].type=="checkbox"&&d[a].getAttribute("class")=="o_checkbox"){d[a].checked=b}}}}function b_briefcase_isChecked(c,e){var b;var a=document.getElementById(c);var d=0;for(b=0;a.elements[b];b++){if(a.elements[b].type=="checkbox"&&a.elements[b].name=="paths"&&a.elements[b].checked){d++}}if(d<1){alert(e);return false}return true}function b_briefcase_toggleCheck(d,c){var a=document.getElementById(d);len=a.elements.length;var b;for(b=0;b<len;b++){if(a.elements[b].name=="paths"){a.elements[b].checked=c}}}function o_doPrint(){var d=jQuery("div.o_iframedisplay iframe");if(d.length>0){try{var a=d[0];frames[a.name].focus();frames[a.name].print();return}catch(c){for(i=0;frames.length>i;i++){a=frames[i];if(a.name=="oaa0"){continue}var b=document.getElementsByName(a.name)[0];if(b&&b.getAttribute("class")=="ext-shim"){continue}if(a.name!=""){try{frames[a.name].focus();frames[a.name].print()}catch(c){window.print()}return}}window.print()}}else{window.print()}}function b_attach_i18n_inline_editing(){jQuery("span.o_translation_i18nitem").hover(function(){jQuery(this.firstChild).show();if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Entered i18nitem::"+this.firstChild,"functions.js:b_attach_i18n_inline_editing()")}},function(){jQuery("a.o_translation_i18nitem_launcher").hide();if(jQuery(document).ooLog().isDebugEnabled()){jQuery(document).ooLog("debug","Leaving i18nitem::"+this,"functions.js:b_attach_i18n_inline_editing()")}});jQuery("a.o_translation_i18nitem_launcher").hover(function(){var a=jQuery(this).parent("span.o_translation_i18nitem");a.effect("highlight")});b_AddOnDomReplacementFinishedCallback(b_attach_i18n_inline_editing)}function b_hideExtMessageBox(){}var BDebugger={_lastDOMCount:0,_lastObjCount:0,_knownGlobalOLATObjects:["o_afterserver","o_onc","o_getMainWin","o_ainvoke","o_info","o_beforeserver","o_ffEvent","o_openPopUp","o_debu_show","o_logwarn","o_dbg_unmark","o_ffRegisterSubmit","o_clearConsole","o_init","o_log","o_allowNextClick","o_dbg_mark","o_debu_hide","o_logerr","o_debu_oldcn","o_debu_oldtt","o_debug_trid","o_log_all"],_countDOMElements:function(){return document.getElementsByTagName("*").length},_countGlobalObjects:function(){var a=0;for(prop in window){a++}return a},logDOMCount:function(){var b=BDebugger;var a=b._countDOMElements();var c=a-b._lastDOMCount;console.log((c>0?"+":"")+c+" \t"+a+" \tDOM element count after DOM replacement");b._lastDOMCount=a;a=null},logGlobalObjCount:function(){var b=BDebugger;var a=b._countGlobalObjects();var c=a-b._lastObjCount;console.log((c>0?"+":"")+c+" \t"+a+" \tGlobal object count after DOM replacement");b._lastObjCount=a;a=null},logGlobalOLATObjects:function(){var b=BDebugger;var a=new Array();for(prop in window){if(prop.indexOf("o_")==0&&b._knownGlobalOLATObjects.indexOf(prop)==-1){a.push(prop)}}if(a.length>0){console.log(a.length+" global OLAT objects found:");a.each(function(c){console.log("\t"+typeof window[c]+" \t"+c)})}}};/*!
* jQuery Transit - CSS3 transitions and transformations
* (c) 2011-2014 Rico Sta. Cruz
* MIT Licensed.
diff --git a/src/test/java/org/olat/modules/qpool/manager/CollectionDAOTest.java b/src/test/java/org/olat/modules/qpool/manager/CollectionDAOTest.java
index 6681d927c138974a50efb28ebfe04edfd7628210..5b2ef06c2566085497e50602a6a1b01a9386d541 100644
--- a/src/test/java/org/olat/modules/qpool/manager/CollectionDAOTest.java
+++ b/src/test/java/org/olat/modules/qpool/manager/CollectionDAOTest.java
@@ -95,7 +95,7 @@ public class CollectionDAOTest extends OlatTestCase {
dbInstance.commitAndCloseSession();
//add the item to the collection
- collectionDao.addItemToCollection(item.getKey(), singletonList(coll));
+ collectionDao.addItemToCollection(item, singletonList(coll));
dbInstance.commit();//check if it's alright
}
@@ -107,8 +107,8 @@ public class CollectionDAOTest extends OlatTestCase {
QuestionItemCollection coll = collectionDao.createCollection("NGC collection 4", id);
QuestionItem item1 = questionDao.createAndPersist(null, "NGC 99", QTIConstants.QTI_12_FORMAT, Locale.GERMAN.getLanguage(), null, null, null, fibType);
QuestionItem item2 = questionDao.createAndPersist(null, "NGC 101", QTIConstants.QTI_12_FORMAT, Locale.GERMAN.getLanguage(), null, null, null, fibType);
- collectionDao.addItemToCollection(item1.getKey(), singletonList(coll));
- collectionDao.addItemToCollection(item2.getKey(), singletonList(coll));
+ collectionDao.addItemToCollection(item1, singletonList(coll));
+ collectionDao.addItemToCollection(item2, singletonList(coll));
dbInstance.commit();//check if it's alright
//load the items of the collection
@@ -143,10 +143,10 @@ public class CollectionDAOTest extends OlatTestCase {
QuestionItemCollection coll2 = collectionDao.createCollection("NGC collection 9", id);
QuestionItem item1 = questionDao.createAndPersist(null, "NGC 103", QTIConstants.QTI_12_FORMAT, Locale.GERMAN.getLanguage(), null, null, null, fibType);
QuestionItem item2 = questionDao.createAndPersist(null, "NGC 104", QTIConstants.QTI_12_FORMAT, Locale.GERMAN.getLanguage(), null, null, null, fibType);
- collectionDao.addItemToCollection(item1.getKey(), singletonList(coll1));
- collectionDao.addItemToCollection(item1.getKey(), singletonList(coll2));
- collectionDao.addItemToCollection(item2.getKey(), singletonList(coll1));
- collectionDao.addItemToCollection(item2.getKey(), singletonList(coll2));
+ collectionDao.addItemToCollection(item1, singletonList(coll1));
+ collectionDao.addItemToCollection(item1, singletonList(coll2));
+ collectionDao.addItemToCollection(item2, singletonList(coll1));
+ collectionDao.addItemToCollection(item2, singletonList(coll2));
dbInstance.commit();
//check if it's alright
@@ -177,8 +177,8 @@ public class CollectionDAOTest extends OlatTestCase {
QuestionItemCollection coll = collectionDao.createCollection("NGC collection 10", id);
QuestionItem item1 = questionDao.createAndPersist(null, "NGC 107", QTIConstants.QTI_12_FORMAT, Locale.GERMAN.getLanguage(), null, null, null, fibType);
QuestionItem item2 = questionDao.createAndPersist(null, "NGC 108", QTIConstants.QTI_12_FORMAT, Locale.GERMAN.getLanguage(), null, null, null, fibType);
- collectionDao.addItemToCollection(item1.getKey(), singletonList(coll));
- collectionDao.addItemToCollection(item2.getKey(), singletonList(coll));
+ collectionDao.addItemToCollection(item1, singletonList(coll));
+ collectionDao.addItemToCollection(item2, singletonList(coll));
dbInstance.commit();
//check if it's alright
diff --git a/src/test/java/org/olat/modules/qpool/manager/QItemQueriesDAOTest.java b/src/test/java/org/olat/modules/qpool/manager/QItemQueriesDAOTest.java
index 4adcca82a6dd75a516c7e81734562d3df26f113b..5413bb3329430dc7ec7be2a7d240916d3f678f65 100644
--- a/src/test/java/org/olat/modules/qpool/manager/QItemQueriesDAOTest.java
+++ b/src/test/java/org/olat/modules/qpool/manager/QItemQueriesDAOTest.java
@@ -141,8 +141,8 @@ public class QItemQueriesDAOTest extends OlatTestCase {
QuestionItemCollection coll = collectionDao.createCollection("NGC collection 3", id);
QuestionItem item1 = questionDao.createAndPersist(null, "NGC 92", QTIConstants.QTI_12_FORMAT, Locale.GERMAN.getLanguage(), null, null, null, fibType);
QuestionItem item2 = questionDao.createAndPersist(null, "NGC 97", QTIConstants.QTI_12_FORMAT, Locale.GERMAN.getLanguage(), null, null, null, fibType);
- collectionDao.addItemToCollection(item1.getKey(), singletonList(coll));
- collectionDao.addItemToCollection(item2.getKey(), singletonList(coll));
+ collectionDao.addItemToCollection(item1, singletonList(coll));
+ collectionDao.addItemToCollection(item2, singletonList(coll));
dbInstance.commit();//check if it's alright
//load the items of the collection
@@ -173,7 +173,7 @@ public class QItemQueriesDAOTest extends OlatTestCase {
Identity id = JunitTestHelper.createAndPersistIdentityAsUser("Coll-Onwer-3-" + UUID.randomUUID().toString());
QuestionItemCollection coll = collectionDao.createCollection("NGC collection 3", id);
QuestionItem item = questionDao.createAndPersist(null, "NGC 92", QTIConstants.QTI_12_FORMAT, Locale.GERMAN.getLanguage(), null, null, null, fibType);
- collectionDao.addItemToCollection(item.getKey(), singletonList(coll));
+ collectionDao.addItemToCollection(item, singletonList(coll));
dbInstance.commit();//check if it's alright
//test order by
@@ -315,7 +315,7 @@ public class QItemQueriesDAOTest extends OlatTestCase {
List<OLATResource> resources = new ArrayList<OLATResource>();
resources.add(group1.getResource());
resources.add(group2.getResource());
- questionDao.share(item.getKey(), resources, false);
+ questionDao.share(item, resources, false);
//retrieve them
List<QuestionItemView> sharedItems1 = qItemQueriesDao.getSharedItemByResource(id, group1.getResource(), null, 0, -1);
@@ -340,7 +340,7 @@ public class QItemQueriesDAOTest extends OlatTestCase {
//share them
List<OLATResource> resources = new ArrayList<OLATResource>();
resources.add(group.getResource());
- questionDao.share(item.getKey(), resources, false);
+ questionDao.share(item, resources, false);
dbInstance.commitAndCloseSession();
diff --git a/src/test/java/org/olat/restapi/NotificationsSubscribersTest.java b/src/test/java/org/olat/restapi/NotificationsSubscribersTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..21eba53307e36a784668b7692be9d1722607acb4
--- /dev/null
+++ b/src/test/java/org/olat/restapi/NotificationsSubscribersTest.java
@@ -0,0 +1,245 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.restapi;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.List;
+import java.util.UUID;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriBuilder;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.util.EntityUtils;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.type.TypeReference;
+import org.junit.Assert;
+import org.junit.Test;
+import org.olat.core.commons.persistence.DB;
+import org.olat.core.commons.services.notifications.NotificationsManager;
+import org.olat.core.commons.services.notifications.Publisher;
+import org.olat.core.commons.services.notifications.PublisherData;
+import org.olat.core.commons.services.notifications.Subscriber;
+import org.olat.core.commons.services.notifications.SubscriptionContext;
+import org.olat.core.commons.services.notifications.restapi.vo.PublisherVO;
+import org.olat.core.commons.services.notifications.restapi.vo.SubscriberVO;
+import org.olat.core.id.Identity;
+import org.olat.core.id.IdentityEnvironment;
+import org.olat.core.id.Roles;
+import org.olat.core.util.nodes.INode;
+import org.olat.core.util.tree.Visitor;
+import org.olat.course.CourseFactory;
+import org.olat.course.ICourse;
+import org.olat.course.nodes.FOCourseNode;
+import org.olat.course.run.userview.CourseTreeVisitor;
+import org.olat.course.run.userview.VisibleTreeFilter;
+import org.olat.modules.fo.Forum;
+import org.olat.repository.RepositoryEntry;
+import org.olat.test.JunitTestHelper;
+import org.olat.test.OlatJerseyTestCase;
+import org.olat.user.restapi.UserVOFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ *
+ * Initial date: 19.01.2016<br>
+ * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ *
+ */
+public class NotificationsSubscribersTest extends OlatJerseyTestCase {
+
+ @Autowired
+ private DB dbInstance;
+ @Autowired
+ private NotificationsManager notificationsManager;
+
+ @Test
+ public void subscribe() throws IOException, URISyntaxException {
+ Identity id1 = JunitTestHelper.createAndPersistIdentityAsRndUser("rest-sub-1");
+ Identity id2 = JunitTestHelper.createAndPersistIdentityAsRndUser("rest-sub-2");
+
+ //deploy a course with forums
+ URL courseWithForumsUrl = MyForumsTest.class.getResource("myCourseWS.zip");
+ Assert.assertNotNull(courseWithForumsUrl);
+ File courseWithForums = new File(courseWithForumsUrl.toURI());
+ String softKey = UUID.randomUUID().toString().replace("-", "");
+ RepositoryEntry courseEntry = CourseFactory.deployCourseFromZIP(courseWithForums, softKey, 4);
+ Assert.assertNotNull(courseEntry);
+
+ //load the course and found the first forum
+ ICourse course = CourseFactory.loadCourse(courseEntry);
+
+ //find the forum
+ IdentityEnvironment ienv = new IdentityEnvironment(id1, new Roles(false, false, false, false, false, false, false));
+ ForumVisitor forumVisitor = new ForumVisitor(course);
+ new CourseTreeVisitor(course, ienv).visit(forumVisitor, new VisibleTreeFilter());
+ FOCourseNode courseNode = forumVisitor.firstNode;
+ Forum forum = forumVisitor.firstForum;
+ Assert.assertNotNull(courseNode);
+ Assert.assertNotNull(forum);
+
+ //put subscribers
+ RestConnection conn = new RestConnection();
+ Assert.assertTrue(conn.login("administrator", "openolat"));
+
+ PublisherVO subscribersVO = new PublisherVO();
+ //publisher data
+ subscribersVO.setType("Forum");
+ subscribersVO.setData(forum.getKey().toString());
+ subscribersVO.setBusinessPath("[RepositoryEntry:" + courseEntry.getKey() + "][CourseNode:" + courseNode.getIdent() + "]");
+ //context
+ subscribersVO.setResName("CourseModule");
+ subscribersVO.setResId(course.getResourceableId());
+ subscribersVO.setSubidentifier(courseNode.getIdent());
+ subscribersVO.getUsers().add(UserVOFactory.get(id1));
+ subscribersVO.getUsers().add(UserVOFactory.get(id2));
+
+ //create the subscribers
+ URI subscribersUri = UriBuilder.fromUri(getContextURI()).path("notifications").path("subscribers").build();
+ HttpPut putMethod = conn.createPut(subscribersUri, MediaType.APPLICATION_JSON, true);
+ conn.addJsonEntity(putMethod, subscribersVO);
+ HttpResponse response = conn.execute(putMethod);
+ Assert.assertEquals(200, response.getStatusLine().getStatusCode());
+ EntityUtils.consume(response.getEntity());
+
+ //get publisher
+ SubscriptionContext subsContext
+ = new SubscriptionContext("CourseModule", course.getResourceableId(), courseNode.getIdent());
+ Publisher publisher = notificationsManager.getPublisher(subsContext);
+ Assert.assertNotNull(publisher);
+
+ //get subscribers
+ List<Subscriber> subscribers = notificationsManager.getSubscribers(publisher);
+ Assert.assertNotNull(subscribers);
+ Assert.assertEquals(2, subscribers.size());
+
+ conn.shutdown();
+ }
+
+ @Test
+ public void unsubscribe() throws IOException, URISyntaxException {
+ Identity id1 = JunitTestHelper.createAndPersistIdentityAsRndUser("rest-sub-3");
+ Identity id2 = JunitTestHelper.createAndPersistIdentityAsRndUser("rest-sub-4");
+ Identity id3 = JunitTestHelper.createAndPersistIdentityAsRndUser("rest-sub-5");
+
+ //deploy a course with forums
+ URL courseWithForumsUrl = MyForumsTest.class.getResource("myCourseWS.zip");
+ Assert.assertNotNull(courseWithForumsUrl);
+ File courseWithForums = new File(courseWithForumsUrl.toURI());
+ String softKey = UUID.randomUUID().toString().replace("-", "");
+ RepositoryEntry courseEntry = CourseFactory.deployCourseFromZIP(courseWithForums, softKey, 4);
+ Assert.assertNotNull(courseEntry);
+
+ //load the course and found the first forum
+ ICourse course = CourseFactory.loadCourse(courseEntry);
+
+ //find the forum
+ IdentityEnvironment ienv = new IdentityEnvironment(id1, new Roles(false, false, false, false, false, false, false));
+ ForumVisitor forumVisitor = new ForumVisitor(course);
+ new CourseTreeVisitor(course, ienv).visit(forumVisitor, new VisibleTreeFilter());
+ FOCourseNode courseNode = forumVisitor.firstNode;
+ Forum forum = forumVisitor.firstForum;
+ Assert.assertNotNull(courseNode);
+ Assert.assertNotNull(forum);
+
+ // the 3 users subscribed to the forum
+ PublisherData publisherData
+ = new PublisherData("Forum", forum.getKey().toString(), "[RepositoryEntry:" + courseEntry.getKey() + "][CourseNode:" + courseNode.getIdent() + "]");
+ SubscriptionContext subsContext
+ = new SubscriptionContext("CourseModule", course.getResourceableId(), courseNode.getIdent());
+ notificationsManager.subscribe(id1, subsContext, publisherData);
+ notificationsManager.subscribe(id2, subsContext, publisherData);
+ notificationsManager.subscribe(id3, subsContext, publisherData);
+ dbInstance.commitAndCloseSession();
+
+ //get the subscriber
+ RestConnection conn = new RestConnection();
+ Assert.assertTrue(conn.login("administrator", "openolat"));
+
+ URI subscribersUri = UriBuilder.fromUri(getContextURI()).path("notifications").path("subscribers")
+ .path(subsContext.getResName()).path(subsContext.getResId().toString()).path(subsContext.getSubidentifier()).build();
+ HttpGet getMethod = conn.createGet(subscribersUri, MediaType.APPLICATION_JSON, true);
+ HttpResponse getResponse = conn.execute(getMethod);
+ Assert.assertEquals(200, getResponse.getStatusLine().getStatusCode());
+ List<SubscriberVO> subscriberVOes = parseGroupArray(getResponse.getEntity().getContent());
+ Assert.assertNotNull(subscriberVOes);
+ Assert.assertEquals(3, subscriberVOes.size());
+
+ SubscriberVO subscriberId2VO = null;
+ for(SubscriberVO subscriberVO:subscriberVOes) {
+ if(subscriberVO.getIdentityKey().equals(id2.getKey())) {
+ subscriberId2VO = subscriberVO;
+ }
+ }
+
+ //delete id2
+ URI deleteSubscriberUri = UriBuilder.fromUri(getContextURI()).path("notifications").path("subscribers")
+ .path(subscriberId2VO.getSubscriberKey().toString()).build();
+ HttpDelete deleteMethod = conn.createDelete(deleteSubscriberUri, MediaType.APPLICATION_JSON);
+ HttpResponse deleteResponse = conn.execute(deleteMethod);
+ Assert.assertEquals(200, deleteResponse.getStatusLine().getStatusCode());
+
+ //check
+ Publisher publisher = notificationsManager.getPublisher(subsContext);
+ List<Subscriber> survivingSubscribers = notificationsManager.getSubscribers(publisher);
+ Assert.assertNotNull(survivingSubscribers);
+ Assert.assertEquals(2, survivingSubscribers.size());
+ for(Subscriber subscriber:survivingSubscribers) {
+ Assert.assertNotEquals(id2, subscriber.getIdentity());
+ }
+ }
+
+ protected List<SubscriberVO> parseGroupArray(InputStream body) {
+ try {
+ ObjectMapper mapper = new ObjectMapper(jsonFactory);
+ return mapper.readValue(body, new TypeReference<List<SubscriberVO>>(){/* */});
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ private static class ForumVisitor implements Visitor {
+ private FOCourseNode firstNode ;
+ private Forum firstForum;
+
+ private final ICourse course;
+
+ public ForumVisitor(ICourse course) {
+ this.course = course;
+ }
+
+ @Override
+ public void visit(INode node) {
+ if(firstNode == null && node instanceof FOCourseNode) {
+ firstNode = (FOCourseNode)node;
+ firstForum = firstNode.loadOrCreateForum(course.getCourseEnvironment());
+ }
+ }
+ }
+}
diff --git a/src/test/java/org/olat/selenium/CourseTest.java b/src/test/java/org/olat/selenium/CourseTest.java
index 95c1997f5383d2a51b166193f5df0deee9d2f514..f7ff38bbdd7dcc55b48c2f329b2002db79c0fd17 100644
--- a/src/test/java/org/olat/selenium/CourseTest.java
+++ b/src/test/java/org/olat/selenium/CourseTest.java
@@ -164,6 +164,53 @@ public class CourseTest {
.clickTree();
}
+ /**
+ * Check if we can create and open a course with this
+ * name: It's me, the "course".
+ * @see https://jira.openolat.org/browse/OO-1839
+ *
+ * @param loginPage
+ * @throws IOException
+ * @throws URISyntaxException
+ */
+ @Test
+ @RunAsClient
+ public void createCourseWithSpecialCharacters(@InitialPage LoginPage loginPage)
+ throws IOException, URISyntaxException {
+
+ UserVO author = new UserRestClient(deploymentUrl).createAuthor();
+ loginPage.loginAs(author.getLogin(), author.getPassword());
+
+ //go to authoring
+ AuthoringEnvPage authoringEnv = navBar
+ .assertOnNavigationPage()
+ .openAuthoringEnvironment();
+
+ String marker = Long.toString(System.currentTimeMillis());
+ String title = "It's me, the \"course\" number " + marker;
+ //create course
+ RepositoryEditDescriptionPage editDescription = authoringEnv
+ .openCreateDropDown()
+ .clickCreate(ResourceType.course)
+ .fillCreateForm(title)
+ .assertOnGeneralTab();
+
+ //from description editor, back to the course
+ editDescription
+ .clickToolbarBack();
+
+ //close the course
+ navBar.closeTab();
+
+ //select the authoring
+ navBar
+ .openAuthoringEnvironment()
+ .selectResource(marker);
+
+ new CoursePageFragment(browser)
+ .assertOnCoursePage();
+ }
+
/**
* Create a course, use the course wizard, select all course
* elements and go further with the standard settings.
diff --git a/src/test/java/org/olat/selenium/page/NavigationPage.java b/src/test/java/org/olat/selenium/page/NavigationPage.java
index 8f78b25c090c529aee271a54949daeedada6ce67..37d5d077b4b707eaf9f76060658c4cd619555e9b 100644
--- a/src/test/java/org/olat/selenium/page/NavigationPage.java
+++ b/src/test/java/org/olat/selenium/page/NavigationPage.java
@@ -176,4 +176,11 @@ public class NavigationPage {
OOGraphene.closeBlueMessageWindow(browser);
return this;
}
+
+ public NavigationPage closeTab() {
+ By closeBy = By.xpath("//li//a[contains(@class,'o_navbar_tab_close')]");
+ browser.findElement(closeBy).click();
+
+ return this;
+ }
}
diff --git a/src/test/java/org/olat/test/AllTestsJunit4.java b/src/test/java/org/olat/test/AllTestsJunit4.java
index a851bf7afb9fada0dacd15d03125e9a9756738c2..d6dba3eab8b0a131b0da71cf19ab021a203d2692 100644
--- a/src/test/java/org/olat/test/AllTestsJunit4.java
+++ b/src/test/java/org/olat/test/AllTestsJunit4.java
@@ -232,6 +232,7 @@ import org.junit.runners.Suite;
org.olat.restapi.I18nTest.class,
org.olat.restapi.MyForumsTest.class,
org.olat.restapi.NotificationsTest.class,
+ org.olat.restapi.NotificationsSubscribersTest.class,
org.olat.restapi.RepositoryEntryLifecycleTest.class,
org.olat.restapi.RepositoryEntriesTest.class,
org.olat.restapi.RestApiLoginFilterTest.class,