Author: solomax
Date: Sun Feb 2 13:08:14 2014
New Revision: 1563609
URL: http://svn.apache.org/r1563609
Log:
[OPENMEETINGS-892] "Add user" button is enabled on group save
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1563609&r1=1563608&r2=1563609&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
Sun Feb 2 13:08:14 2014
@@ -62,7 +62,7 @@ public class GroupForm extends AdminComm
@Override
public void updateView(AjaxRequestTarget target) {
usersPanel.update(getOrgId());
- target.add(this);
+ target.add(this, groupList);
target.appendJavaScript("groupsInit();");
}
@@ -115,16 +115,15 @@ public class GroupForm extends AdminComm
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
getBean(OrganisationDao.class).delete(getModelObject(),
getUserId());
- target.add(groupList);
- target.appendJavaScript("groupsInit();");
+ this.setModelObject(new Organisation());
+ updateView(target);
}
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
getBean(OrganisationDao.class).update(getModelObject(),
getUserId());
hideNewRecord();
- target.add(groupList);
- target.appendJavaScript("groupsInit();");
+ updateView(target);
}
@Override
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1563609&r1=1563608&r2=1563609&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
Sun Feb 2 13:08:14 2014
@@ -69,20 +69,25 @@ public class GroupsPanel extends AdminPa
//Adding the Group Form
form = new GroupForm("form", listContainer, new Organisation()){
- private static final long serialVersionUID =
-3042797340375988889L;
+ private static final long serialVersionUID = 1L;
+ private AjaxButton processAddClass() {
+ boolean orgSaved =
getModelObject().getOrganisation_id() != null;
+
addUsersBtn.add(AttributeModifier.replace("class", orgSaved ? "formNewButton" :
"formNewButton disabled"));
+ addUsersBtn.setEnabled(orgSaved);
+ return addUsersBtn;
+ }
+
@Override
protected void onModelChanged() {
super.onModelChanged();
- boolean orgEmpty =
getModelObject().getOrganisation_id() == null;
-
addUsersBtn.add(AttributeModifier.replace("class", orgEmpty ? "formNewButton
disabled" : "formNewButton"));
- addUsersBtn.setEnabled(!orgEmpty);
+ processAddClass();
}
@Override
public void updateView(AjaxRequestTarget target) {
super.updateView(target);
- target.add(addUsersBtn);
+ target.add(processAddClass());
}
};
add(form.add(addUsersBtn.setOutputMarkupId(true)));
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1563609&r1=1563608&r2=1563609&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
Sun Feb 2 13:08:14 2014
@@ -62,7 +62,7 @@ public class GroupForm extends AdminComm
@Override
public void updateView(AjaxRequestTarget target) {
usersPanel.update(getOrgId());
- target.add(this);
+ target.add(this, groupList);
target.appendJavaScript("groupsInit();");
}
@@ -115,16 +115,15 @@ public class GroupForm extends AdminComm
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
getBean(OrganisationDao.class).delete(getModelObject(),
getUserId());
- target.add(groupList);
- target.appendJavaScript("groupsInit();");
+ this.setModelObject(new Organisation());
+ updateView(target);
}
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
getBean(OrganisationDao.class).update(getModelObject(),
getUserId());
hideNewRecord();
- target.add(groupList);
- target.appendJavaScript("groupsInit();");
+ updateView(target);
}
@Override
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1563609&r1=1563608&r2=1563609&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
Sun Feb 2 13:08:14 2014
@@ -69,20 +69,25 @@ public class GroupsPanel extends AdminPa
//Adding the Group Form
form = new GroupForm("form", listContainer, new Organisation()){
- private static final long serialVersionUID =
-3042797340375988889L;
+ private static final long serialVersionUID = 1L;
+ private AjaxButton processAddClass() {
+ boolean orgSaved =
getModelObject().getOrganisation_id() != null;
+
addUsersBtn.add(AttributeModifier.replace("class", orgSaved ? "formNewButton" :
"formNewButton disabled"));
+ addUsersBtn.setEnabled(orgSaved);
+ return addUsersBtn;
+ }
+
@Override
protected void onModelChanged() {
super.onModelChanged();
- boolean orgEmpty =
getModelObject().getOrganisation_id() == null;
-
addUsersBtn.add(AttributeModifier.replace("class", orgEmpty ? "formNewButton
disabled" : "formNewButton"));
- addUsersBtn.setEnabled(!orgEmpty);
+ processAddClass();
}
@Override
public void updateView(AjaxRequestTarget target) {
super.updateView(target);
- target.add(addUsersBtn);
+ target.add(processAddClass());
}
};
add(form.add(addUsersBtn.setOutputMarkupId(true)));
