From ac8856f08c997210ab90d3c1711150c575201cf0 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 1 Dec 2020 09:55:24 +0100 Subject: [PATCH 1/3] Show draft status on events and posts in group admin Closes #413 Signed-off-by: Thomas Citharel --- js/src/graphql/group.ts | 1 + js/src/graphql/post.ts | 1 + js/src/views/Admin/AdminGroupProfile.vue | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/js/src/graphql/group.ts b/js/src/graphql/group.ts index a6f4686b9..d91071b9c 100644 --- a/js/src/graphql/group.ts +++ b/js/src/graphql/group.ts @@ -96,6 +96,7 @@ export const GROUP_FIELDS_FRAGMENTS = gql` uuid title beginsOn + draft options { maximumAttendeeCapacity } diff --git a/js/src/graphql/post.ts b/js/src/graphql/post.ts index 4d2971b35..b92913af6 100644 --- a/js/src/graphql/post.ts +++ b/js/src/graphql/post.ts @@ -8,6 +8,7 @@ export const POST_FRAGMENT = gql` slug url body + draft author { id preferredUsername diff --git a/js/src/views/Admin/AdminGroupProfile.vue b/js/src/views/Admin/AdminGroupProfile.vue index 261704193..74087dcc6 100644 --- a/js/src/views/Admin/AdminGroupProfile.vue +++ b/js/src/views/Admin/AdminGroupProfile.vue @@ -200,6 +200,9 @@ :to="{ name: RouteName.EVENT, params: { uuid: props.row.uuid } }" > {{ props.row.title }} + {{ + $t("Draft") + }} {{ props.row.title }} + {{ + $t("Draft") + }} Date: Tue, 1 Dec 2020 09:56:05 +0100 Subject: [PATCH 2/3] Remove leftovers Signed-off-by: Thomas Citharel --- js/src/utils/i18n.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/js/src/utils/i18n.ts b/js/src/utils/i18n.ts index 06f722087..b4aaaf9e9 100644 --- a/js/src/utils/i18n.ts +++ b/js/src/utils/i18n.ts @@ -9,7 +9,6 @@ const DEFAULT_LOCALE = "en_US"; let language = getLocaleData() || (document.documentElement.getAttribute("lang") as string); -console.log("lang1", language); language = language || @@ -17,14 +16,12 @@ language = /-/, "_" ); -console.log("language2", language); export const locale = language && Object.prototype.hasOwnProperty.call(langs, language) ? language : language.split("-")[0]; -console.log("lang3", locale); Vue.use(VueI18n); export const i18n = new VueI18n({ From 8140f5e22748260ab7d0f2c4fac0c17435434285 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 1 Dec 2020 09:56:14 +0100 Subject: [PATCH 3/3] Fix mediaSize being requested for every group Signed-off-by: Thomas Citharel --- js/src/graphql/group.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/graphql/group.ts b/js/src/graphql/group.ts index d91071b9c..89a14a716 100644 --- a/js/src/graphql/group.ts +++ b/js/src/graphql/group.ts @@ -84,7 +84,6 @@ export const GROUP_FIELDS_FRAGMENTS = gql` id url } - mediaSize organizedEvents( afterDatetime: $afterDateTime beforeDatetime: $beforeDateTime @@ -214,6 +213,7 @@ export const GET_GROUP = gql` $organisedEventslimit: Int ) { getGroup(id: $id) { + mediaSize ...GroupFullFields } }