From 66921944b05a7f86d976bbc52d6136f4eccb60ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 2 Mar 2016 10:20:02 +0100 Subject: [PATCH] Fix some errors with the project menu when jitsi is selected as videoconference system --- .../project-menu/project-menu.controller.coffee | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/modules/components/project-menu/project-menu.controller.coffee b/app/modules/components/project-menu/project-menu.controller.coffee index cf5710a3..23fc3591 100644 --- a/app/modules/components/project-menu/project-menu.controller.coffee +++ b/app/modules/components/project-menu/project-menu.controller.coffee @@ -95,25 +95,28 @@ class ProjectMenuController return sectionName _videoConferenceUrl: () -> + # Get base url if @.project.get("videoconferences") == "appear-in" baseUrl = "https://appear.in/" else if @.project.get("videoconferences") == "talky" baseUrl = "https://talky.io/" else if @.project.get("videoconferences") == "jitsi" baseUrl = "https://meet.jit.si/" - url = @.project.get("slug") + "-" + taiga.slugify(@.project.get("videoconferences_extra_data")) - url = url.replace(/-/g, "") - return baseUrl + url else if @.project.get("videoconferences") == "custom" return @.project.get("videoconferences_extra_data") else return "" + # Add prefix to the chat room name if exist if @.project.get("videoconferences_extra_data") - url = @.project.get("slug") + "-" + @.project.get("videoconferences_extra_data") + url = @.project.get("slug") + "-" + taiga.slugify(@.project.get("videoconferences_extra_data")) else url = @.project.get("slug") + # Some special cases + if @.project.get("videoconferences") == "jitsi" + url = url.replace(/-/g, "") + return baseUrl + url angular.module("taigaComponents").controller("ProjectMenu", ProjectMenuController)