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

Merge branch '090-expanded-status' into mconf-live0.6.2

Browse Source 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
This commit is contained in:
Felipe Cecagno 2015-01-24 17:48:19 -02:00
commit df1fe03c29
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
View File

@ -249,7 +249,7 @@ trait UsersApp {
}
}
def handleChangeUserStatus(msg: ChangeUserStatus):Unit = {
def handleChangeUserStatus(msg: ChangeUserStatus):Unit = {
users.getUser(msg.userID) foreach {user =>
val uvo = msg.status match {
case "mood" => user.copy( mood=msg.value.asInstanceOf[String])
@ -260,7 +260,7 @@ trait UsersApp {
users.addUser(uvo)
}
outGW.send(new UserStatusChange(meetingID, recorded, msg.userID, msg.status, msg.value))
}
}
}
def handleChangeUserRole(msg: ChangeUserRole) {

2
bigbluebutton-client/branding/default/style/css/BBBDefault.css
View File

@ -966,4 +966,4 @@ Alert {
.moodSadStyle {
icon: Embed('assets/images/icon-7-sad-face.png');
}
}