From 93fc0ac859eae8d55861d5c92b1c9d6d1e18e607 Mon Sep 17 00:00:00 2001 From: Luka Vandervelden Date: Wed, 25 Dec 2019 02:40:43 +0100 Subject: [PATCH] Users displayed in project permissions list. --- client/project-creation-modal.ls | 11 +++++++++-- client/project.ls | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/client/project-creation-modal.ls b/client/project-creation-modal.ls index e9dbcb9..0ff8365 100644 --- a/client/project-creation-modal.ls +++ b/client/project-creation-modal.ls @@ -36,6 +36,8 @@ ProjectCreationModal = (args) -> new-user: "" new-user-permission: \read } + + users-cache: args.users-cache } self.project.tasks := void @@ -88,7 +90,12 @@ ProjectCreationModal = (args) -> for uid in self.project.permissions[permission] h \tr {key: uid} [ # FIXME: show full name or login - h \td [ uid.to-string! ] + h \td [ + if user = self.users-cache.get-user uid + user.profile?.full_name || user.login + else + uid.to-string! + ] h \td [ permission ] ] ] @@ -121,7 +128,7 @@ ProjectCreationModal = (args) -> control [ h \div.button.is-success.is-outlined { onclick: -> - uid = parse-int self.input.new-user + uid = (parse-int self.input.new-user) || self.input.new-user perm = self.input.new-user-permission self.input.new-user := "" diff --git a/client/project.ls b/client/project.ls index 0836cc1..6cfb2f3 100644 --- a/client/project.ls +++ b/client/project.ls @@ -149,6 +149,8 @@ Project = (self, todod-ws, users-cache) -> on-validation: (project) -> console.log "Requesting edit for", project self.todod-ws.edit-list project.id, project + + users-cache: users-cache } } [ icon \cog