From 02c6121a6ccde7eca1e06c110b24b1a689930cfe Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Sun, 9 Dec 2012 20:44:52 +0000 Subject: [PATCH] - rename set and get configxml api --- .../core/managers/ConfigManager2.as | 2 +- .../bigbluebutton/main/model/ConfigParameters.as | 2 +- .../web/controllers/ApiController.groovy | 16 +++------------- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/managers/ConfigManager2.as b/bigbluebutton-client/src/org/bigbluebutton/core/managers/ConfigManager2.as index 9c6fe152be..7ea4246c70 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/core/managers/ConfigManager2.as +++ b/bigbluebutton-client/src/org/bigbluebutton/core/managers/ConfigManager2.as @@ -15,7 +15,7 @@ package org.bigbluebutton.core.managers import org.bigbluebutton.core.model.Config; public class ConfigManager2 extends EventDispatcher { - public static const CONFIG_XML:String = "bigbluebutton/api/configXML"; + public static const CONFIG_XML:String = "bigbluebutton/api/getConfigXML"; private var _config:Config = null; diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as index 8bcd8419e4..c68dcdc2ac 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as +++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as @@ -35,7 +35,7 @@ package org.bigbluebutton.main.model import org.bigbluebutton.main.model.modules.ModuleDescriptor; public class ConfigParameters { - public static const CONFIG_XML:String = "bigbluebutton/api/configXML"; + public static const CONFIG_XML:String = "bigbluebutton/api/getConfigXML"; private var _urlLoader:URLLoader; diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy index c5c4588036..74d6899721 100755 --- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy +++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy @@ -149,17 +149,7 @@ class ApiController { } Meeting newMeeting = paramsProcessorUtil.processCreateParams(params); - - if (! StringUtils.isEmpty(params.configToken)) { - Config conf = meetingService.getConfig(params.configToken); - if (conf == null) { - errors.noConfigFoundForToken(params.configToken); - respondWithErrors(errors); - } else { - newMeeting.setDefaultConfig(conf.config); - } - } - + meetingService.createMeeting(newMeeting); // See if the request came with pre-uploading of presentation. @@ -760,7 +750,7 @@ class ApiController { /*********************************************** * CONFIG API ***********************************************/ - def configXml = { + def setConfigXML = { if (StringUtils.isEmpty(params.checksum)) { invalid("checksumError", "You did not pass the checksum security check") @@ -831,7 +821,7 @@ class ApiController { /*********************************************** * CONFIG API ***********************************************/ - def configXML = { + def getConfigXML = { if (! session["user-token"] || (meetingService.getUserSession(session['user-token']) == null)) { log.info("No session for user in conference.")