Author: solomax
Date: Tue Sep 25 00:36:09 2012
New Revision: 1389664
URL: http://svn.apache.org/viewvc?rev=1389664&view=rev
Log:
Wicket: Group admin (not tested)
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java?rev=1389664&r1=1389663&r2=1389664&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java
Tue Sep 25 00:36:09 2012
@@ -81,4 +81,7 @@ public class OrganisationUserDAO impleme
}
}
+ public void add() {
+
+ }
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java?rev=1389664&r1=1389663&r2=1389664&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java
Tue Sep 25 00:36:09 2012
@@ -153,18 +153,23 @@ public class Organisation_Users implemen
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj) {
return true;
- if (obj == null)
+ }
+ if (obj == null) {
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
+ }
Organisation_Users other = (Organisation_Users) obj;
if (organisation_users_id == null) {
- if (other.organisation_users_id != null)
+ if (other.organisation_users_id != null) {
return false;
- } else if
(!organisation_users_id.equals(other.organisation_users_id))
+ }
+ } else if
(!organisation_users_id.equals(other.organisation_users_id)) {
return false;
+ }
return true;
}
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java?rev=1389664&r1=1389663&r2=1389664&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/AddUsersForm.java
Tue Sep 25 00:36:09 2012
@@ -24,6 +24,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.persistence.beans.domain.Organisation;
+import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
@@ -39,13 +41,14 @@ import org.apache.wicket.model.PropertyM
public class AddUsersForm extends Form<Void> {
private static final long serialVersionUID = -2458265250684437277L;
+ private Organisation organisation;
private String userSearchText;
private List<Users> usersInList = new ArrayList<Users>();
private List<Users> usersToAdd = new ArrayList<Users>();
public AddUsersForm(String id) {
super(id);
-
+
IModel<List<Users>> listUsersModel = new
PropertyModel<List<Users>>(AddUsersForm.this, "usersInList");
IModel<List<Users>> selectedUsersModel = new
PropertyModel<List<Users>>(AddUsersForm.this, "usersToAdd");
final ListMultipleChoice<Users> users = new
ListMultipleChoice<Users>("users"
@@ -80,10 +83,17 @@ public class AddUsersForm extends Form<V
protected void onAfterSubmit(AjaxRequestTarget target,
org.apache.wicket.markup.html.form.Form<?> form) {
for (Users u : usersToAdd) {
- //add them
+ /*
+ for (Organisation_Users ou :
u.getOrganisation_users()) {
+ ou.
+ }
+ */
}
}
});
}
+ public void setOrganisation(Organisation org) {
+ organisation = org;
+ }
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java?rev=1389664&r1=1389663&r2=1389664&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
Tue Sep 25 00:36:09 2012
@@ -38,7 +38,31 @@ public class GroupsPanel extends AdminPa
super(id);
final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
final WebMarkupContainer addUsersBtn = new
WebMarkupContainer("addUsersBtn");
- final GroupForm form = new GroupForm("form", listContainer, new
Organisation());
+ final AddUsersForm addUsersForm = new AddUsersForm("addUsers");
+ add(addUsersForm);
+
+ final GroupForm form = new GroupForm("form", listContainer, new
Organisation()){
+ private static final long serialVersionUID =
-3042797340375988889L;
+
+ @Override
+ protected void onModelChanged() {
+ super.onModelChanged();
+ if (getModelObject().getOrganisation_id() ==
null) {
+
addUsersBtn.add(AttributeModifier.replace("class", "formNewButton")
+ ,
AttributeModifier.replace("onclick", "addUsers();"));
+ } else {
+
addUsersBtn.add(AttributeModifier.replace("class", "formNewButton disabled")
+ ,
AttributeModifier.replace("onclick", ""));
+ }
+ addUsersForm.setOrganisation(getModelObject());
+ }
+
+ @Override
+ void updateView(AjaxRequestTarget target) {
+ super.updateView(target);
+ target.add(addUsersBtn);
+ }
+ };
add(form.add(addUsersBtn.setOutputMarkupId(true)));
DataView<Organisation> dataView = new
DataView<Organisation>("groupList", new
OmDataProvider<Organisation>(OrganisationDAO.class)) {
@@ -54,8 +78,6 @@ public class GroupsPanel extends AdminPa
protected void
onEvent(AjaxRequestTarget target) {
form.setModelObject(organisation);
-
addUsersBtn.add(AttributeModifier.replace("class", "formNewButton")
- ,
AttributeModifier.replace("onclick", "addUsers();")); //FIXME need to be handle
'New Record'
form.updateView(target);
target.add(form);
}
@@ -73,7 +95,5 @@ public class GroupsPanel extends AdminPa
target.add(listContainer);
}
});
-
- add(new AddUsersForm("addUsers"));
}
}
