Merge pull request #2281 from nextcloud/bugfix/noid/better-start-call…

…-setting Better start call setting
nextcloud · Oct 8, 2019 · 5c0ada8 · 5c0ada8
2 parents 11ff086 + ef2f4e6
commit 5c0ada8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/css/settings-admin.scss b/css/settings-admin.scss
@@ -30,7 +30,7 @@
 		border-color: $color-error;
 	}
 
-	label {
+	div.signaling-server label {
 		margin: 0 20px;
 		display: inline-block;
 	}

diff --git a/js/admin/general-settings.js b/js/admin/general-settings.js
diff --git a/js/admin/general-settings.js.map b/js/admin/general-settings.js.map
diff --git a/vue/src/views/GeneralSettings.vue b/vue/src/views/GeneralSettings.vue
@@ -30,7 +30,11 @@
 				v-model="startCalls"
 				:options="startCallOptions"
 				label="label"
-				track-by="value" />
+				track-by="value"
+				@input="saveChanges" />
+		</p>
+		<p>
+			<em>{{ t('spreed', 'When a call has started, everyone with access to the conversation can join the call.') }}</em>
 		</p>
 	</div>
 </template>
@@ -68,7 +72,7 @@ export default {
 		saveChanges() {
 			this.loading = true
 
-			OCP.AppConfig.setValue('spreed', 'start_calls', this.startCalls, {
+			OCP.AppConfig.setValue('spreed', 'start_calls', this.startCalls.value, {
 				success: function() {
 					this.loading = false
 				}.bind(this)
@@ -77,9 +81,19 @@ export default {
 	}
 }
 </script>
-<style scoped>
+<style scoped lang="scss">
 p {
 	display: flex;
 	align-items: center;
+
+	label {
+		display: block;
+		margin-right: 10px;
+	}
+}
+
+.multiselect {
+	flex-grow: 1;
+	max-width: 300px;
 }
 </style>