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

Merge branch '090-change-role' into mconf-live0.6.1

Browse Source
This commit is contained in:
Felipe Cecagno 2014-11-23 23:00:55 -02:00
commit 404b68f7b4
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,6 +161,9 @@ package org.bigbluebutton.main.model.users
_role = r;
moderator = _role == MODERATOR;
verifyUserStatus();
if (me) {
applyLockSettings();
}
}
[Bindable] public var moderator:Boolean = false;

1
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
View File

@ -117,6 +117,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
this.toolTip = ResourceUtil.getInstance().getString('bbb.mainToolbar.recordBtn.toolTip.start');
}
} else {
this.enabled = false;
if (recording) {
this.toolTip = ResourceUtil.getInstance().getString('bbb.mainToolbar.recordBtn.toolTip.recording');
} else {