mirror of https://github.com/sualko/cloud_bbb
feat: sharing rooms with moderators and users
Dialog and permissions managementpull/281/head
parent
7f1760c372
commit
b099136690
|
@ -194,11 +194,15 @@ const RoomRow: React.FC<Props> = (props) => {
|
||||||
return <span></span>;
|
return <span></span>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
function edit(field: string, type: 'text' | 'number' = 'text', canEdit = true, options?) {
|
function edit(field: string, type: 'text' | 'number' = 'text', canEdit = true, options?) {
|
||||||
=======
|
=======
|
||||||
function edit(field: string, type: 'text' | 'number' = 'text', canEdit: boolean = true, options?) {
|
function edit(field: string, type: 'text' | 'number' = 'text', canEdit: boolean = true, options?) {
|
||||||
>>>>>>> 63daf83 (feat: manage view of rooms for moderators and users)
|
>>>>>>> 63daf83 (feat: manage view of rooms for moderators and users)
|
||||||
|
=======
|
||||||
|
function edit(field: string, type: 'text' | 'number' = 'text', canEdit = true, options?) {
|
||||||
|
>>>>>>> 82951e9 (feat: sharing rooms with moderators and users)
|
||||||
return canEdit ?
|
return canEdit ?
|
||||||
<EditableValue field={field} value={room[field]} setValue={updateRoom} type={type} options={options} />
|
<EditableValue field={field} value={room[field]} setValue={updateRoom} type={type} options={options} />
|
||||||
:
|
:
|
||||||
|
|
Loading…
Reference in New Issue