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 2017/09/07 01:52:24 UTC
openmeetings git commit: [OPENMEETINGS-1691] missing boolean config
is added
Repository: openmeetings
Updated Branches:
refs/heads/master c2f97d778 -> 4ea4a8cdb
[OPENMEETINGS-1691] missing boolean config is added
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/4ea4a8cd
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/4ea4a8cd
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/4ea4a8cd
Branch: refs/heads/master
Commit: 4ea4a8cdb4c239a53b25bd4cf1de78d24b0d5a19
Parents: c2f97d7
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Sep 7 08:52:08 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Sep 7 08:52:08 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/backup/BackupImport.java | 2 ++
.../org/apache/openmeetings/installation/ImportInitvalues.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4ea4a8cd/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index 158e32c..d2430b5 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -76,6 +76,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_SOX
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_FRONTEND;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_OAUTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_SOAP;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REPLY_TO_ORGANIZER;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_ALLOW_REMOTE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS_SHOW;
@@ -231,6 +232,7 @@ public class BackupImport {
configTypes.put(CONFIG_DASHBOARD_SHOW_MYROOMS, Configuration.Type.bool);
configTypes.put(CONFIG_DASHBOARD_SHOW_CHAT, Configuration.Type.bool);
configTypes.put(CONFIG_DASHBOARD_SHOW_RSS, Configuration.Type.bool);
+ configTypes.put(CONFIG_REPLY_TO_ORGANIZER, Configuration.Type.bool);
configTypes.put(CONFIG_IGNORE_BAD_SSL, Configuration.Type.bool);
configTypes.put(CONFIG_FLASH_SECURE, Configuration.Type.bool);
configTypes.put(CONFIG_DEFAULT_GROUP_ID, Configuration.Type.number);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4ea4a8cd/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
index 9d878e7..382e4c8 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
@@ -65,6 +65,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_FRONTEND;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_OAUTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_SOAP;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REPLY_TO_ORGANIZER;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_ALLOW_REMOTE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS_SHOW;
@@ -115,7 +116,6 @@ import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.wicket.util.string.StringValue;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -309,7 +309,7 @@ public class ImportInitvalues {
cfgDao.add(CONFIG_DEFAULT_LDAP_ID, "0", Configuration.Type.number, "Ldap domain selected by default in the login screen");
// set inviter's email address as ReplyTo in email invitations
- cfgDao.add(OpenmeetingsVariables.CONFIG_REPLY_TO_ORGANIZER, cfg.replyToOrganizer, Configuration.Type.bool,
+ cfgDao.add(CONFIG_REPLY_TO_ORGANIZER, cfg.replyToOrganizer, Configuration.Type.bool,
"Set inviter's email address as ReplyTo in email invitations (1 == set, 0 == NOT set)");
cfgDao.add(CONFIG_DEFAULT_LANDING_ZONE, "user/dashboard", Configuration.Type.string