Skip to content

Commit 568eded

Browse files
fix: gestion des parcellaire sans OC_ID
1 parent de3b0b9 commit 568eded

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

src/components/records/Header.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@ const canDisplayHistory = computed(() => Array.isArray(record.audit_history) &&
144144
const versionMenu = ref(false);
145145
const versionMenuRef = ref(null);
146146
const showEditVersionModal = ref(false);
147-
const readonly = computed(() => permissions.isOc && record.oc_id !== userStore.user?.organismeCertificateur?.id);
147+
const readonly = computed(
148+
() => permissions.isOc && record.oc_id != null && record.oc_id !== userStore.user?.organismeCertificateur?.id,
149+
);
148150
onClickOutside(versionMenuRef, ({ target }) => {
149151
if (!target.classList.contains("show-versions")) {
150152
versionMenu.value = false;

src/components/records/Table/FeatureGroup.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,11 @@ const groupErrors = computed(() => {
235235
});
236236
237237
const readonly = computed(() => {
238-
return permissions.isOc && recordStore.record.oc_id !== userStore.user?.organismeCertificateur?.id;
238+
return (
239+
permissions.isOc &&
240+
recordStore.record.oc_id != null &&
241+
recordStore.record.oc_id !== userStore.user?.organismeCertificateur?.id
242+
);
239243
});
240244
241245
function toggleEditForm(featureId) {

src/pages/exploitations/[numeroBio]/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ async function handleRedirect(record) {
373373
}
374374
375375
function isReadonly(record) {
376-
return permissions.isOc && record.oc_id !== userStore.user?.organismeCertificateur?.id;
376+
return permissions.isOc && record.oc_id != null && record.oc_id !== userStore.user?.organismeCertificateur?.id;
377377
}
378378
</script>
379379

src/stores/permissions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const usePermissions = defineStore("permissions", () => {
1515
// Tests
1616

1717
const canEditParcellaire = computed(() => {
18-
if (isOc.value && recordStore.record.oc_id === userStore.user?.organismeCertificateur?.id) {
18+
if (isOc.value && (recordStore.record.oc_id === null || recordStore.record.oc_id === userStore.user?.organismeCertificateur?.id)) {
1919
return true;
2020
}
2121

src/stores/permissions.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ describe("roles", () => {
4747
userStore.roles = [ROLES.OC_CERTIF];
4848

4949
expect(permissions.isOc).toEqual(true);
50-
expect(permissions.canAddParcelle).toEqual(false);
50+
expect(permissions.canAddParcelle).toEqual(true);
5151

5252
userStore.user = { organismeCertificateur: { id: 2 } };
5353
recordStore.record.oc_id = 1;
@@ -88,7 +88,7 @@ describe("roles", () => {
8888
userStore.roles = [ROLES.OC_AUDIT];
8989

9090
expect(permissions.isOc).toEqual(true);
91-
expect(permissions.canAddParcelle).toEqual(false);
91+
expect(permissions.canAddParcelle).toEqual(true);
9292

9393
recordStore.record.certification_state = CertificationState.OPERATOR_DRAFT;
9494
userStore.user = { organismeCertificateur: { id: 1 } };

0 commit comments

Comments
 (0)