diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fc334a66..e90bcaa7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,7 +124,7 @@ jobs: with: repository: opendatateam/udata path: ${{ env.UDATA_WORKING_DIR }} - ref: main + ref: partial_editors - name: Set up uv uses: astral-sh/setup-uv@v6 diff --git a/components/AdminMembershipRequest/AdminMembershipRequest.vue b/components/AdminMembershipRequest/AdminMembershipRequest.vue index 5d52b7493..3b32989a3 100644 --- a/components/AdminMembershipRequest/AdminMembershipRequest.vue +++ b/components/AdminMembershipRequest/AdminMembershipRequest.vue @@ -52,7 +52,7 @@ {{ t('Rôle proposé :') }} {{ roleLabel }} diff --git a/components/AdminOrgInvitation/AdminOrgInvitation.vue b/components/AdminOrgInvitation/AdminOrgInvitation.vue index 1e6172275..2b7bb87b2 100644 --- a/components/AdminOrgInvitation/AdminOrgInvitation.vue +++ b/components/AdminOrgInvitation/AdminOrgInvitation.vue @@ -39,7 +39,7 @@ {{ t('Rôle proposé :') }} {{ roleLabel }} diff --git a/components/DatasetAssignmentSelector.vue b/components/DatasetAssignmentSelector.vue new file mode 100644 index 000000000..126ad8087 --- /dev/null +++ b/components/DatasetAssignmentSelector.vue @@ -0,0 +1,162 @@ + + + diff --git a/datagouv-components/src/types/organizations.ts b/datagouv-components/src/types/organizations.ts index 9eebe9488..e6716dccd 100644 --- a/datagouv-components/src/types/organizations.ts +++ b/datagouv-components/src/types/organizations.ts @@ -1,7 +1,7 @@ import type { User } from './users' import type { Badges } from './badges' -export type MemberRole = 'admin' | 'editor' +export type MemberRole = 'admin' | 'editor' | 'partial_editor' export type Member = { role: MemberRole diff --git a/pages/admin/organizations/[oid]/members.vue b/pages/admin/organizations/[oid]/members.vue index a228c1a11..93d9a2304 100644 --- a/pages/admin/organizations/[oid]/members.vue +++ b/pages/admin/organizations/[oid]/members.vue @@ -61,7 +61,7 @@ > @@ -200,7 +206,10 @@ > {{ t("Dernière connexion") }} - + {{ t("Actions") }} @@ -254,8 +263,8 @@