Author: sebawagner
Date: Sat Oct 6 15:54:38 2012
New Revision: 1395102
URL: http://svn.apache.org/viewvc?rev=1395102&view=rev
Log:
OPENMEETINGS-428 workaround for bug in user-organization mapping, user_id not
being refreshed when updating an user instance with other group associations
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java?rev=1395102&r1=1395101&r2=1395102&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java
Sat Oct 6 15:54:38 2012
@@ -420,7 +420,8 @@ public class Organisationmanagement {
Long insertedby) {
try {
if
(this.getOrganisation_UserByUserAndOrganisation(user_id, organisation_id) ==
null) {
- return addOrganisationUserObj(user_id,
getOrgUser(organisation_id, insertedby));
+ return addOrganisationUserObj(user_id,
+ getOrgUser(organisation_id,
insertedby));
} else {
return -35L;
}
@@ -430,10 +431,10 @@ public class Organisationmanagement {
return null;
}
- public Organisation_Users getOrgUser(Long organisation_id,
- Long insertedby) {
+ public Organisation_Users getOrgUser(Long organisation_id, Long
insertedby) {
- Organisation_Users orgUser = new
Organisation_Users(orgDao.get(organisation_id));
+ Organisation_Users orgUser = new Organisation_Users(
+ orgDao.get(organisation_id));
orgUser.setDeleted(false);
return orgUser;
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=1395102&r1=1395101&r2=1395102&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
Sat Oct 6 15:54:38 2012
@@ -52,7 +52,17 @@ public class OrganisationUserDAO impleme
q.setParameter("id", orgId);
q.setFirstResult(start);
q.setMaxResults(count);
- return q.getResultList();
+
+ // This refresh is necessary because after saving the user
entity the
+ // user_id is somehow not
+ // filled into the Organisation_Users, this might be fixed by
+ // implementing another
+ // JOIN or mapping strategy
+ List<Organisation_Users> orgUserList = q.getResultList();
+ for (Organisation_Users ou : orgUserList) {
+ em.refresh(ou);
+ }
+ return orgUserList;
}
public long count() {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java?rev=1395102&r1=1395101&r2=1395102&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
Sat Oct 6 15:54:38 2012
@@ -117,7 +117,11 @@ public class RoomForm extends AdminBaseF
add(new CheckBox("showMicrophoneStatus"));
add(new CheckBox("chatModerated"));
+ // FIXME: Room user moderator list
+
+ add(new CheckBox("isModeratedRoom"));
+
// attach an ajax validation behavior to all form component's
keydown
// event and throttle it down to once per second
AjaxFormValidatingBehavior.addToAllFormComponents(this,
"keydown",
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html?rev=1395102&r1=1395101&r2=1395102&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
Sat Oct 6 15:54:38 2012
@@ -130,10 +130,19 @@
<br/>
<wicket:ommessage key="1513" />
<input type="checkbox" wicket:id="chatModerated" />
<br/>
+
<!--
+ FIXME: add user moderator list
<wicket:ommessage key="587" />
<select wicket:id="moderators"/>
<br/>
-->
+
+ <wicket:ommessage key="640" />
<input type="checkbox" wicket:id="isModeratedRoom" />
+ <br/>
+ <wicket:ommessage key="823" />
+ <br/>
+ <wicket:ommessage key="816" />
+ <br/>
</fieldset>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java?rev=1395102&r1=1395101&r2=1395102&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
Sat Oct 6 15:54:38 2012
@@ -421,5 +421,5 @@ public class UserForm extends AdminBaseF
add(new TextArea<String>("userOffers"));
add(new TextArea<String>("userSearchs"));
}
-
+
}
