Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
walint
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
hub
walint
Commits
73e7a698
"ldap3_mapper_new/core.py" did not exist on "1306790eccb9b757f8e1a369fd6f7fba48d969ab"
Commit
73e7a698
authored
3 years ago
by
stuebinm
Browse files
Options
Downloads
Patches
Plain Diff
server: expose jitsi rooms in maps list endpoint
parent
92945f9e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
server/Handlers.hs
+2
-1
2 additions, 1 deletion
server/Handlers.hs
with
2 additions
and
1 deletion
server/Handlers.hs
+
2
−
1
View file @
73e7a698
...
@@ -17,7 +17,7 @@ module Handlers (
...
@@ -17,7 +17,7 @@ module Handlers (
import
Universum
import
Universum
import
CheckDir
(
DirResult
(
dirresultMaps
))
import
CheckDir
(
DirResult
(
dirresultMaps
))
import
CheckMap
(
MapResult
(
MapResult
,
mapresultBadges
))
import
CheckMap
(
MapResult
(
..
))
import
Control.Concurrent.STM
(
TQueue
,
dupTChan
,
readTChan
,
import
Control.Concurrent.STM
(
TQueue
,
dupTChan
,
readTChan
,
writeTQueue
)
writeTQueue
)
import
Data.Aeson
(
ToJSON
(
..
),
(
.=
))
import
Data.Aeson
(
ToJSON
(
..
),
(
.=
))
...
@@ -60,6 +60,7 @@ instance ToJSON MapService where
...
@@ -60,6 +60,7 @@ instance ToJSON MapService where
mapInfo
rev
mappath
MapResult
{
..
}
=
A
.
object
mapInfo
rev
mappath
MapResult
{
..
}
=
A
.
object
[
"badges"
.=
mapresultBadges
[
"badges"
.=
mapresultBadges
-- TODO: type-safe url library for adding the slash?
-- TODO: type-safe url library for adding the slash?
,
"jitsi"
.=
mapresultJitsis
,
"url"
.=
(
orgUrl
org
<>
adjustedWebPath
rev
org
<>
"/"
<>
toText
mappath
)
]
,
"url"
.=
(
orgUrl
org
<>
adjustedWebPath
rev
org
<>
"/"
<>
toText
mappath
)
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment