Skip to content

Improvements #1411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 5, 2023
Merged

Improvements #1411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions frontend/src/modules/organization/components/view/organization-view-members.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
<p
class="text-sm leading-5 text-center italic text-gray-400 pl-6"
>
Members can take up to two minutes to appear in the
list
No members are currently working in this organization.
</p>
</div>
<div v-else>
Expand Down
21 changes: 17 additions & 4 deletions frontend/src/modules/organization/pages/organization-view-page.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,25 @@
<div class="panel w-full col-span-2">
<el-tabs v-model="tab">
<el-tab-pane
label="Associated members"
label="Current members"
name="members"
>
<app-organization-view-members
:organization-id="props.id"
/>
<template #label>
<span class="flex gap-2">
<span>Current members</span>
<el-tooltip
content="Members that are currently a part of this organization."
placement="top"
>
<i class="ri-information-line" />
</el-tooltip>
</span>
</template>
<template #default>
<app-organization-view-members
:organization-id="props.id"
/>
</template>
</el-tab-pane>
<el-tab-pane
label="Activities"
Expand Down