"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java" between
apache-openmeetings-6.1.0-src.tar.gz and apache-openmeetings-6.2.0-src.tar.gz

About: OpenMeetings is a browser-based software that allows you to set up instantly a conference in the Web. You can use your microphone or webcam, share documents on a white board, share your screen or record meetings. Source code.

GroupUsersPanel.java  (apache-openmeetings-6.1.0-src):GroupUsersPanel.java  (apache-openmeetings-6.2.0-src)
skipping to change at line 21 skipping to change at line 21
* *
* Unless required by applicable law or agreed to in writing, * Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an * software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.apache.openmeetings.web.admin.groups; package org.apache.openmeetings.web.admin.groups;
import static org.apache.openmeetings.web.common.confirmation.ConfirmationBehavi or.newOkCancelDangerConfirm; import static org.apache.openmeetings.web.common.confirmation.ConfirmationHelper .newOkCancelDangerConfirm;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.openmeetings.db.dao.user.GroupUserDao; import org.apache.openmeetings.db.dao.user.GroupUserDao;
import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.admin.SearchableDataView; import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.WebSession; import org.apache.openmeetings.web.app.WebSession;
skipping to change at line 43 skipping to change at line 43
import org.apache.openmeetings.web.data.SearchableDataProvider; import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.OnChangeAjaxBehavior; import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.ResourceModel; import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean; import org.apache.wicket.spring.injection.annot.SpringBean;
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.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 GroupUsersPanel extends Panel { public class GroupUsersPanel extends Panel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private long groupId; private long groupId;
private List<GroupUser> users2add = new ArrayList<>(); private List<GroupUser> users2add = new ArrayList<>();
@SpringBean @SpringBean
private UserDao userDao; private UserDao userDao;
public GroupUsersPanel(String id, long groupId) { public GroupUsersPanel(String id, long groupId) {
skipping to change at line 98 skipping to change at line 98
User u = userDao.get(grpU ser.getUser().getId()); User u = userDao.get(grpU ser.getUser().getId());
u.getGroupUsers().remove( grpUser); u.getGroupUsers().remove( grpUser);
userDao.update(u, WebSess ion.getUserId()); userDao.update(u, WebSess ion.getUserId());
} }
target.add(GroupUsersPanel.this); target.add(GroupUsersPanel.this);
} }
}; };
del.setIconType(FontAwesome5IconType.times_s) del.setIconType(FontAwesome5IconType.times_s)
.add(newOkCancelDangerConfirm(thi s, getString("833"))); .add(newOkCancelDangerConfirm(thi s, getString("833")));
item.add(del); item.add(del);
item.add(new BootstrapBadge("new", new ResourceMo del("lbl.new"), BadgeBehavior.Type.Warning).setVisible((grpUser.getId() == null) )); item.add(new BootstrapBadge("new", new ResourceMo del("lbl.new"), BackgroundColorBehavior.Color.Warning).setVisible((grpUser.getId () == null)));
} }
}; };
add(dataView).setOutputMarkupId(true); add(dataView).setOutputMarkupId(true);
add(new PagedEntityListPanel("navigator", dataView) { add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
protected void onEvent(AjaxRequestTarget target) { protected void onEvent(AjaxRequestTarget target) {
target.add(GroupUsersPanel.this); target.add(GroupUsersPanel.this);
} }
 End of changes. 4 change blocks. 
3 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)