RoomForm.java (apache-openmeetings-6.1.0-src) | : | RoomForm.java (apache-openmeetings-6.2.0-src) | ||
---|---|---|---|---|
skipping to change at line 28 | skipping to change at line 28 | |||
*/ | */ | |||
package org.apache.openmeetings.web.admin.rooms; | package org.apache.openmeetings.web.admin.rooms; | |||
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel; | import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel; | |||
import static org.apache.openmeetings.util.OpenmeetingsVariables.isRecordingsEna bled; | import static org.apache.openmeetings.util.OpenmeetingsVariables.isRecordingsEna bled; | |||
import static org.apache.openmeetings.web.admin.AdminUserChoiceProvider.PAGE_SIZ E; | import static org.apache.openmeetings.web.admin.AdminUserChoiceProvider.PAGE_SIZ E; | |||
import static org.apache.openmeetings.web.app.Application.kickUser; | import static org.apache.openmeetings.web.app.Application.kickUser; | |||
import static org.apache.openmeetings.web.app.WebSession.getRights; | import static org.apache.openmeetings.web.app.WebSession.getRights; | |||
import static org.apache.openmeetings.web.app.WebSession.getUserId; | import static org.apache.openmeetings.web.app.WebSession.getUserId; | |||
import static org.apache.openmeetings.web.common.BasePanel.EVT_CHANGE; | import static org.apache.openmeetings.web.common.BasePanel.EVT_CHANGE; | |||
import static org.apache.openmeetings.web.common.confirmation.ConfirmationBehavi or.newOkCancelDangerConfirm; | import static org.apache.openmeetings.web.common.confirmation.ConfirmationHelper .newOkCancelDangerConfirm; | |||
import static org.apache.wicket.validation.validator.StringValidator.maximumLeng th; | import static org.apache.wicket.validation.validator.StringValidator.maximumLeng th; | |||
import java.util.ArrayList; | import java.util.ArrayList; | |||
import java.util.Collection; | import java.util.Collection; | |||
import java.util.Iterator; | import java.util.Iterator; | |||
import java.util.List; | import java.util.List; | |||
import java.util.stream.Collectors; | import java.util.stream.Collectors; | |||
import org.apache.openmeetings.db.dao.file.FileItemDao; | import org.apache.openmeetings.db.dao.file.FileItemDao; | |||
import org.apache.openmeetings.db.dao.room.RoomDao; | import org.apache.openmeetings.db.dao.room.RoomDao; | |||
skipping to change at line 83 | skipping to change at line 83 | |||
import org.apache.wicket.model.PropertyModel; | import org.apache.wicket.model.PropertyModel; | |||
import org.apache.wicket.model.ResourceModel; | import org.apache.wicket.model.ResourceModel; | |||
import org.apache.wicket.model.util.CollectionModel; | import org.apache.wicket.model.util.CollectionModel; | |||
import org.apache.wicket.spring.injection.annot.SpringBean; | import org.apache.wicket.spring.injection.annot.SpringBean; | |||
import org.apache.wicket.util.string.Strings; | import org.apache.wicket.util.string.Strings; | |||
import org.wicketstuff.select2.ChoiceProvider; | import org.wicketstuff.select2.ChoiceProvider; | |||
import org.wicketstuff.select2.Response; | import org.wicketstuff.select2.Response; | |||
import org.wicketstuff.select2.Select2Choice; | import org.wicketstuff.select2.Select2Choice; | |||
import org.wicketstuff.select2.Select2MultiChoice; | import org.wicketstuff.select2.Select2MultiChoice; | |||
import de.agilecoders.wicket.core.markup.html.bootstrap.badge.BadgeBehavior; | ||||
import de.agilecoders.wicket.core.markup.html.bootstrap.badge.BootstrapBadge; | import de.agilecoders.wicket.core.markup.html.bootstrap.badge.BootstrapBadge; | |||
import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButt on; | import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButt on; | |||
import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink ; | import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink ; | |||
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons; | import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons; | |||
import de.agilecoders.wicket.core.markup.html.bootstrap.utilities.BackgroundColo rBehavior; | ||||
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5I conType; | import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5I conType; | |||
public class RoomForm extends AdminBaseForm<Room> { | public class RoomForm extends AdminBaseForm<Room> { | |||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | |||
private static final List<Long> DROPDOWN_NUMBER_OF_PARTICIPANTS = List.of (2L, 4L, 6L, 8L, 10L, 12L, 14L, 16L, 20L, 25L, 32L, 50L, | private static final List<Long> DROPDOWN_NUMBER_OF_PARTICIPANTS = List.of (2L, 4L, 6L, 8L, 10L, 12L, 14L, 16L, 20L, 25L, 32L, 50L, | |||
100L, 150L, 200L, 500L, 1000L); | 100L, 150L, 200L, 500L, 1000L); | |||
private final WebMarkupContainer roomList; | private final WebMarkupContainer roomList; | |||
private final TextField<String> pin = new TextField<>("pin"); | private final TextField<String> pin = new TextField<>("pin"); | |||
private final WebMarkupContainer moderatorContainer = new WebMarkupContai ner("moderatorContainer"); | private final WebMarkupContainer moderatorContainer = new WebMarkupContai ner("moderatorContainer"); | |||
private final WebMarkupContainer filesContainer = new WebMarkupContainer( "filesContainer"); | private final WebMarkupContainer filesContainer = new WebMarkupContainer( "filesContainer"); | |||
skipping to change at line 328 | skipping to change at line 328 | |||
target.add(moderatorContainer); | target.add(moderatorContainer); | |||
} | } | |||
}; | }; | |||
del.setIconType(FontAwesome5IconType.times_s) | del.setIconType(FontAwesome5IconType.times_s) | |||
.add(newOkCancelDangerConfirm(thi s, getString("833"))); | .add(newOkCancelDangerConfirm(thi s, getString("833"))); | |||
item.add(new CheckBox("superModerator", new Prope rtyModel<>(moderator, "superModerator"))) | item.add(new CheckBox("superModerator", new Prope rtyModel<>(moderator, "superModerator"))) | |||
.add(new Label("userId", String.valueOf(m oderator.getUser().getId()))) | .add(new Label("userId", String.valueOf(m oderator.getUser().getId()))) | |||
.add(name) | .add(name) | |||
.add(new Label("email", moderator.getUser ().getAddress().getEmail())) | .add(new Label("email", moderator.getUser ().getAddress().getEmail())) | |||
.add(del) | .add(del) | |||
.add(new BootstrapBadge("new", new Resour ceModel("lbl.new"), BadgeBehavior.Type.Warning).setVisible((moderator.getId() == null))); | .add(new BootstrapBadge("new", new Resour ceModel("lbl.new"), BackgroundColorBehavior.Color.Warning).setVisible((moderator .getId() == null))); | |||
} | } | |||
}).setOutputMarkupId(true)); | }).setOutputMarkupId(true)); | |||
add(new CheckBox("moderated")); | add(new CheckBox("moderated")); | |||
add(new CheckBox("waitModerator")); | add(new CheckBox("waitModerator")); | |||
// Files | // Files | |||
Form<Void> filesForm = new Form<>("filesForm"); | Form<Void> filesForm = new Form<>("filesForm"); | |||
add(filesForm.add(new Select2MultiChoice<>("files2add", files2add , new ChoiceProvider<BaseFileItem>() { | add(filesForm.add(new Select2MultiChoice<>("files2add", files2add , new ChoiceProvider<BaseFileItem>() { | |||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | |||
End of changes. 4 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added |