Author: solomax
Date: Sun Apr 20 17:57:44 2014
New Revision: 1588810
URL: http://svn.apache.org/r1588810
Log:
[OPENMEETINGS-976] deleted config can be restored
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/basic/Configuration.java
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/basic/Configuration.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1588810&r1=1588809&r2=1588810&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/basic/Configuration.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/basic/Configuration.java
Sun Apr 20 17:57:44 2014
@@ -142,7 +142,7 @@ public class Configuration implements Se
this.updatetime = updatetime;
}
- public boolean getDeleted() {
+ public boolean isDeleted() {
return deleted;
}
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java?rev=1588810&r1=1588809&r2=1588810&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
Sun Apr 20 17:57:44 2014
@@ -242,11 +242,11 @@ public class BackupImport {
List<Configuration> list = readList(serializer, f,
"configs.xml", "configs", Configuration.class, true);
for (Configuration c : list) {
- if (c.getConf_key() == null || c.getDeleted()) {
+ if (c.getConf_key() == null || c.isDeleted()) {
continue;
}
Configuration cfg =
configurationDao.forceGet(c.getConf_key());
- if (cfg != null && !cfg.getDeleted()) {
+ if (cfg != null && !cfg.isDeleted()) {
log.warn("Non deleted configuration
with same key is found! old value: {}, new value: {}", cfg.getConf_value(),
c.getConf_value());
}
c.setConfiguration_id(cfg == null ? null :
cfg.getConfiguration_id());
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1588810&r1=1588809&r2=1588810&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
Sun Apr 20 17:57:44 2014
@@ -64,7 +64,7 @@ public class ConfigForm extends AdminBas
public void validate(IValidatable<String> validatable) {
Configuration c =
getBean(ConfigurationDao.class).forceGet(validatable.getValue());
- if (c != null &&
!c.getConfiguration_id().equals(ConfigForm.this.getModelObject().getConfiguration_id()))
{
+ if (c != null && !c.isDeleted() &&
!c.getConfiguration_id().equals(ConfigForm.this.getModelObject().getConfiguration_id()))
{
error(WebSession.getString(1544L));
}
}
@@ -81,6 +81,11 @@ public class ConfigForm extends AdminBas
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
+ ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
+ Configuration c =
cfgDao.forceGet(getModelObject().getConf_key());
+ if (c != null && c.isDeleted() &&
!c.getConfiguration_id().equals(getModelObject().getConfiguration_id())) {
+
getModelObject().setConfiguration_id(c.getConfiguration_id());
+ }
setModelObject(getBean(ConfigurationDao.class).update(getModelObject(),
WebSession.getUserId()));
hideNewRecord();
target.add(listContainer);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1588810&r1=1588809&r2=1588810&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
Sun Apr 20 17:57:44 2014
@@ -142,7 +142,7 @@ public class Configuration implements Se
this.updatetime = updatetime;
}
- public boolean getDeleted() {
+ public boolean isDeleted() {
return deleted;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1588810&r1=1588809&r2=1588810&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Sun Apr 20 17:57:44 2014
@@ -242,11 +242,11 @@ public class BackupImport {
List<Configuration> list = readList(serializer, f,
"configs.xml", "configs", Configuration.class, true);
for (Configuration c : list) {
- if (c.getConf_key() == null || c.getDeleted()) {
+ if (c.getConf_key() == null || c.isDeleted()) {
continue;
}
Configuration cfg =
configurationDao.forceGet(c.getConf_key());
- if (cfg != null && !cfg.getDeleted()) {
+ if (cfg != null && !cfg.isDeleted()) {
log.warn("Non deleted configuration
with same key is found! old value: {}, new value: {}", cfg.getConf_value(),
c.getConf_value());
}
c.setConfiguration_id(cfg == null ? null :
cfg.getConfiguration_id());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1588810&r1=1588809&r2=1588810&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
Sun Apr 20 17:57:44 2014
@@ -64,7 +64,7 @@ public class ConfigForm extends AdminBas
public void validate(IValidatable<String> validatable) {
Configuration c =
getBean(ConfigurationDao.class).forceGet(validatable.getValue());
- if (c != null &&
!c.getConfiguration_id().equals(ConfigForm.this.getModelObject().getConfiguration_id()))
{
+ if (c != null && !c.isDeleted() &&
!c.getConfiguration_id().equals(ConfigForm.this.getModelObject().getConfiguration_id()))
{
error(WebSession.getString(1544L));
}
}
@@ -81,6 +81,11 @@ public class ConfigForm extends AdminBas
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
+ ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
+ Configuration c =
cfgDao.forceGet(getModelObject().getConf_key());
+ if (c != null && c.isDeleted() &&
!c.getConfiguration_id().equals(getModelObject().getConfiguration_id())) {
+
getModelObject().setConfiguration_id(c.getConfiguration_id());
+ }
setModelObject(getBean(ConfigurationDao.class).update(getModelObject(),
WebSession.getUserId()));
hideNewRecord();
target.add(listContainer);
