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

no-jira: reduce warning of the suer activity logger in feed, remove translator warning

parent 332f7b98
No related branches found
No related tags found
No related merge requests found
...@@ -203,7 +203,7 @@ public class CertificatesOptionsController extends FormBasicController { ...@@ -203,7 +203,7 @@ public class CertificatesOptionsController extends FormBasicController {
formLayout.add(recertificationCont); formLayout.add(recertificationCont);
int timelapse = courseConfig.getRecertificationTimelapse(); int timelapse = courseConfig.getRecertificationTimelapse();
reCertificationTimelapseEl = uifactory.addIntegerElement("timelapse", timelapse, recertificationCont); reCertificationTimelapseEl = uifactory.addIntegerElement("timelapse", null, timelapse, recertificationCont);
reCertificationTimelapseEl.setDomReplacementWrapperRequired(false); reCertificationTimelapseEl.setDomReplacementWrapperRequired(false);
reCertificationTimelapseEl.setDisplaySize(4); reCertificationTimelapseEl.setDisplaySize(4);
...@@ -212,7 +212,7 @@ public class CertificatesOptionsController extends FormBasicController { ...@@ -212,7 +212,7 @@ public class CertificatesOptionsController extends FormBasicController {
translate("recertification.month"), translate("recertification.year") translate("recertification.month"), translate("recertification.year")
}; };
RecertificationTimeUnit timelapseUnit = courseConfig.getRecertificationTimelapseUnit(); RecertificationTimeUnit timelapseUnit = courseConfig.getRecertificationTimelapseUnit();
reCertificationTimelapseUnitEl = uifactory.addDropdownSingleselect("timelapse.unit", recertificationCont, timelapseUnitKeys, timelapseUnitValues, null); reCertificationTimelapseUnitEl = uifactory.addDropdownSingleselect("timelapse.unit", null, recertificationCont, timelapseUnitKeys, timelapseUnitValues, null);
reCertificationTimelapseUnitEl.setDomReplacementWrapperRequired(false); reCertificationTimelapseUnitEl.setDomReplacementWrapperRequired(false);
if(timelapseUnit != null) { if(timelapseUnit != null) {
reCertificationTimelapseUnitEl.select(timelapseUnit.name(), true); reCertificationTimelapseUnitEl.select(timelapseUnit.name(), true);
......
...@@ -229,7 +229,7 @@ public class EditMembershipController extends FormBasicController { ...@@ -229,7 +229,7 @@ public class EditMembershipController extends FormBasicController {
translate("role.repo.owner"), translate("role.repo.tutor"), translate("role.repo.participant") translate("role.repo.owner"), translate("role.repo.tutor"), translate("role.repo.participant")
}; };
boolean managed = RepositoryEntryManagedFlag.isManaged(repoEntry, RepositoryEntryManagedFlag.membersmanagement); boolean managed = RepositoryEntryManagedFlag.isManaged(repoEntry, RepositoryEntryManagedFlag.membersmanagement);
repoRightsEl = uifactory.addCheckboxesVertical("repoRights", formLayout, repoRightsKeys, repoValues, 1); repoRightsEl = uifactory.addCheckboxesVertical("repoRights", null, formLayout, repoRightsKeys, repoValues, 1);
repoRightsEl.setEnabled(!managed); repoRightsEl.setEnabled(!managed);
if(member != null) { if(member != null) {
RepoPermission repoPermission = PermissionHelper.getPermission(repoEntry, member, memberships); RepoPermission repoPermission = PermissionHelper.getPermission(repoEntry, member, memberships);
......
...@@ -47,13 +47,15 @@ import org.olat.core.logging.activity.ResourceableTypeList; ...@@ -47,13 +47,15 @@ import org.olat.core.logging.activity.ResourceableTypeList;
* @author Florian Gngi * @author Florian Gngi
*/ */
/* package protected */class FeedLoggingAction extends BaseLoggingAction { /* package protected */class FeedLoggingAction extends BaseLoggingAction {
private static ResourceableTypeList FEED_READ_RESOURCES = new ResourceableTypeList(). private static ResourceableTypeList FEED_READ_RESOURCES = new ResourceableTypeList().
// this one is a message in a feed-node in a course // this one is a message in a feed-node in a course
addMandatory(OlatResourceableType.course, OlatResourceableType.node, OlatResourceableType.feed, OlatResourceableType.feedItem). addMandatory(OlatResourceableType.course, OlatResourceableType.node, OlatResourceableType.feed, OlatResourceableType.feedItem).
or().addMandatory(OlatResourceableType.course, OlatResourceableType.node, OlatResourceableType.feedItem). or().addMandatory(OlatResourceableType.course, OlatResourceableType.node, OlatResourceableType.feed).
// this one is a message in a standalone feed or().addMandatory(OlatResourceableType.course, OlatResourceableType.node, OlatResourceableType.feedItem).
or().addMandatory(OlatResourceableType.feed, OlatResourceableType.feedItem); // this one is a message in a standalone feed
or().addMandatory(OlatResourceableType.feed, OlatResourceableType.feedItem).
or().addMandatory(OlatResourceableType.feed);
/** /**
* Feed level actions * Feed level actions
......
...@@ -215,11 +215,11 @@ public class EPStructureDetailsController extends FormBasicController { ...@@ -215,11 +215,11 @@ public class EPStructureDetailsController extends FormBasicController {
if (restriction != null && restriction.getAmount() > 0) { if (restriction != null && restriction.getAmount() > 0) {
amountStr = Integer.toString(restriction.getAmount()); amountStr = Integer.toString(restriction.getAmount());
} }
final TextElement amountElement = uifactory.addTextElement("collect.restriction.amount." + count, "", 2, amountStr, collectContainer); final TextElement amountElement = uifactory.addTextElement("collect.restriction.amount." + count, null, 2, amountStr, collectContainer);
amountElement.setDomReplacementWrapperRequired(false); amountElement.setDomReplacementWrapperRequired(false);
amountElement.setDisplaySize(3); amountElement.setDisplaySize(3);
StaticTextElement errorElement = uifactory.addStaticTextElement("collect.restriction.error." + count, "", collectContainer); StaticTextElement errorElement = uifactory.addStaticTextElement("collect.restriction.error." + count, null, "", collectContainer);
errorElement.setVisible(false); errorElement.setVisible(false);
restrictionElements.add(restrictionElement); restrictionElements.add(restrictionElement);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment