You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/10/26 04:47:43 UTC
svn commit: r1402379 - in
/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings:
data/basic/dao/ servlet/outputhandler/ web/components/admin/groups/
Author: solomax
Date: Fri Oct 26 02:47:42 2012
New Revision: 1402379
URL: http://svn.apache.org/viewvc?rev=1402379&view=rev
Log:
OPENMEETINGS-453 is fixed;
Wicket: groups panel slightly changed
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java?rev=1402379&r1=1402378&r2=1402379&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java Fri Oct 26 02:47:42 2012
@@ -368,6 +368,8 @@ public class ConfigurationDao implements
}
public Configuration update(Configuration entity, long userId) {
+ String key = entity.getConf_key();
+ String value = entity.getConf_value();
if (entity.getConfiguration_id() == null
|| entity.getConfiguration_id() <= 0) {
entity.setStarttime(new Date());
@@ -379,6 +381,13 @@ public class ConfigurationDao implements
entity.setUpdatetime(new Date());
this.updateConfig(entity);
}
+ if ("crypt_ClassName".equals(key)) {
+ ScopeApplicationAdapter.configKeyCryptClassName = value;
+ } else if ("show.whiteboard.draw.status".equals(key)) {
+ ScopeApplicationAdapter.whiteboardDrawStatus = "1".equals(value);
+ } else if ("application.name".equals(key)) {
+ appName = value;
+ }
//TODO ensure entity returned is updated
return entity;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1402379&r1=1402378&r2=1402379&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java Fri Oct 26 02:47:42 2012
@@ -177,7 +177,7 @@ public class BackupImportController exte
@Autowired
private PollManagement pollManagement;
@Autowired
- private ConfigurationDao configurationDaoImpl;
+ private ConfigurationDao configurationDao;
@Autowired
private AsteriskDAOImpl asteriskDAOImpl;
@Autowired
@@ -283,7 +283,7 @@ public class BackupImportController exte
for (Users u : list) {
OmTimeZone tz = u.getOmTimeZone();
if (tz.getJname() == null) {
- String jNameTimeZone = configurationDaoImpl.getConfValue(
+ String jNameTimeZone = configurationDao.getConfValue(
"default.timezone", String.class, "Europe/Berlin");
OmTimeZone omTimeZone = omTimeZoneDaoImpl.getOmTimeZone(jNameTimeZone);
u.setOmTimeZone(omTimeZone);
@@ -300,7 +300,9 @@ public class BackupImportController exte
Server us = u.getServer();
if (us != null) {
Server s = serverDaoImpl.getServerByAddress(us.getAddress());
- serverDaoImpl.saveServer(s.getId(), us.getName(), us.getAddress());
+ s.setName(us.getName());
+ s.setAddress(us.getAddress());
+ serverDaoImpl.update(s, 1L);
}
}
}
@@ -337,7 +339,9 @@ public class BackupImportController exte
Server us = r.getServer();
if (us != null) {
Server s = serverDaoImpl.getServerByAddress(us.getAddress());
- serverDaoImpl.saveServer(s.getId(), us.getName(), us.getAddress());
+ s.setName(us.getName());
+ s.setAddress(us.getAddress());
+ serverDaoImpl.update(s, 1L);
}
}
}
@@ -439,6 +443,12 @@ public class BackupImportController exte
List<FlvRecording> list = readList(serializer, f, "flvRecordings.xml", "flvrecordings", FlvRecording.class, true);
for (FlvRecording fr : list) {
fr.setFlvRecordingId(0);
+ if (fr.getRoom_id() != null) {
+ fr.setRoom_id(roomsMap.get(fr.getRoom_id()));
+ }
+ if (fr.getOwnerId() != null) {
+ fr.setOwnerId(usersMap.get(fr.getOwnerId()));
+ }
for (FlvRecordingMetaData meta : fr.getFlvRecordingMetaData()) {
meta.setFlvRecordingMetaDataId(0);
meta.setFlvRecording(fr);
@@ -573,10 +583,10 @@ public class BackupImportController exte
List<Configuration> list = readList(serializer, f, "configs.xml", "configs", Configuration.class, true);
for (Configuration c : list) {
- Configuration cfg = configurationDaoImpl.getConfKey(c
+ Configuration cfg = configurationDao.getConfKey(c
.getConf_key());
c.setConfiguration_id(cfg == null ? null : cfg.getConfiguration_id());
- configurationDaoImpl.updateConfig(c);
+ configurationDao.update(c, 1L);
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.html?rev=1402379&r1=1402378&r2=1402379&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.html Fri Oct 26 02:47:42 2012
@@ -39,19 +39,6 @@
</tbody>
</table>
</div>
-
- <!--
- <table class="adminListTable" style="min-width: 200px;">
- <tr>
- <th><wicket:ommessage key="177" /></th>
- <th><wicket:ommessage key="275" /></th>
- </tr>
- <tr wicket:id="userList">
- <td><span wicket:id="label"></span></td>
- <td><div class="formCancelButton" wicket:id="deleteUserBtn" wicket:ommessage="title:274"><input/></div></td>
- </tr>
- </table>
- -->
</div>
</wicket:panel>
</html>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html?rev=1402379&r1=1402378&r2=1402379&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html Fri Oct 26 02:47:42 2012
@@ -28,6 +28,7 @@
, autoOpen: false
, resizable: false
, width: 400
+ , modal: true
});
var documentHeight = $(document).height();
$('#adminForm').height(documentHeight-114);
@@ -79,29 +80,6 @@
</div>
</fieldset>
</div>
-
- <!--
- <table>
- <tr>
- <td style="font-weight: bold;"><wicket:ommessage key="170" /></td>
- <td> </td>
- </tr>
- <tr>
- <td><wicket:ommessage key="171" /></td>
- <td><input type="text" wicket:id="name" /></td>
- </tr>
- <tr>
- <td style="font-weight: bold;"><wicket:ommessage key="273" /></td>
- <td style="text-align: right;"><div wicket:id="addUsersBtn" class="formNewButton disabled"><input/></div></td>
- </tr>
- <tr>
- <td><wicket:ommessage key="177" /></td>
- <td>
- <div wicket:id="users"></div>
- </td>
- </tr>
- </table>
- -->
</form>
</div>
</div>
@@ -117,10 +95,10 @@
</tr>
<tr>
<td><wicket:ommessage key="183" /></td>
- <td><select wicket:id="users" style="width: 200px;"></select></td>
+ <td><select wicket:id="users" style="width: 200px; height: 300px;"></select></td>
</tr>
<tr>
- <td style="text-align: right"><input type="button" wicket:id="add" /></td>
+ <td colspan="2" style="text-align: right"><input type="button" wicket:id="add" /></td>
</tr>
</table>
</form>