Skip to content
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.

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

organization-related improvements to admin api #2028

Merged
merged 11 commits into from Mar 4, 2020

Conversation

@opqdonut
Copy link
Collaborator

opqdonut commented Mar 3, 2020

for #1893

  • allow organization owners to edit, archive and disable catalogue items
  • return 403 when organization owner tries to edit something
    outside his organization
  • return 404 when trying to edit a nonexisting catalogue item
  • allow creating catalogue items with mismatched organizations
  • allow creating resources with mismatched organizations
  • more tests

Definition of Done / Review checklist

Reviewability

  • link to issue

API

  • API is backwards compatible or completely new

Documentation

  • update changelog if necessary

Testing

  • valuable features are integration / browser / acceptance tested automatically

Follow-up

  • new tasks are created for pending or remaining tasks
  • no critical TODOs left to implement
@opqdonut opqdonut mentioned this pull request Mar 3, 2020
22 of 22 tasks complete
@opqdonut opqdonut changed the title organization-related improvements to catalogue item admin api organization-related improvements to admin api Mar 3, 2020
@opqdonut opqdonut changed the title organization-related improvements to admin api WIP: organization-related improvements to admin api Mar 3, 2020
@opqdonut opqdonut changed the title WIP: organization-related improvements to admin api organization-related improvements to admin api Mar 3, 2020
@opqdonut opqdonut force-pushed the check-organization-edit-1893 branch from de9ea9e to ca54629 Mar 3, 2020
@Macroz
Macroz approved these changes Mar 4, 2020
(-> id
get-localized-catalogue-item
:organization
util/forbidden-organization-error))

This comment has been minimized.

Copy link
@Macroz

Macroz Mar 4, 2020

Collaborator

As discussed let's refactor the "utilities" a bit later.

form-id (test-data/create-form! {:form/organization "organization1"})
wf-id (test-data/create-workflow! {:organization "organization1"})
res-id (test-data/create-resource! {:organization "organization1"})]
Comment on lines +85 to +87

This comment has been minimized.

Copy link
@Macroz

Macroz Mar 4, 2020

Collaborator

I think this is rather ugly that one of the test-data -helpers requires namespaced keys and the others don't. The actual create-form! function even recreates the namespaced keys after destructuring.

@opqdonut opqdonut merged commit 6f9e8b7 into master Mar 4, 2020
6 checks passed
6 checks passed
WIP Ready for review
Details
ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: doo Your tests passed on CircleCI!
Details
ci/circleci: ok Your tests passed on CircleCI!
Details
ci/circleci: test Your tests passed on CircleCI!
Details
ci/circleci: without-db Your tests passed on CircleCI!
Details
@opqdonut opqdonut deleted the check-organization-edit-1893 branch Mar 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.