BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed lockSettings config loading with dynamic config.xml;

Browse Source
This commit is contained in:
Tiago Daniel Jacobs 2014-01-20 01:20:04 -02:00
parent 0679568656
commit ac265adb1e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
View File

@ -53,7 +53,6 @@ package org.bigbluebutton.main.model.users {
sort.compareFunction = sortFunction;
users.sort = sort;
users.refresh();
configLockSettings();
}
// Custom sort function for the users ArrayCollection. Need to put dial-in users at the very bottom.
@ -406,7 +405,7 @@ package org.bigbluebutton.main.model.users {
/**
* Read default lock settings from config.xml
* */
private function configLockSettings():void {
public function configLockSettings():void {
var config:Config = BBB.initConfigManager().config;
var allowModeratorLocking:Boolean, disableCam:Boolean, disableMic:Boolean, disablePrivateChat:Boolean, disablePublicChat:Boolean;

2
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
View File

@ -76,6 +76,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.bigbluebutton.common.events.ToolbarButtonEvent;
import org.bigbluebutton.core.BBB;
import org.bigbluebutton.core.events.LockControlEvent;
import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.main.events.AppVersionEvent;
import org.bigbluebutton.main.events.BBBEvent;
import org.bigbluebutton.main.events.ConfigEvent;
@ -133,6 +134,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var confirmingLogout:Boolean = false;
public function initOptions(e:Event):void {
UserManager.getInstance().getConference().configLockSettings();
layoutOptions = new LayoutOptions();
layoutOptions.parseOptions();
showToolbarOpt = layoutOptions.showToolbar;