Organization hierarchy #1038

davidread · 2013-06-24T14:18:19Z

Allow organizations to be assembled into a tree hierarchy. Use Member objects to link them, with a 'parent' or 'child' capacity.

Have config options to determine whether a user's admin/editor/member rights automatically apply to organizations lower in the hierarchy.

Add 'parent organization' field to the organization form. Show/hide it according to a config option 'organization_hierarchy.enabled'.

(We decided that an admin for an organization should decide who the org's parent should be, since that can only add extra rights to other users. The alternatives is that an admin for an organization can add child organizations, but that would give that admin new rights to the child. You could require that a user has to be admin for both the parent and the child to edit the hierarchy, but that is a much more complicated system to implement, manage, explain etc.)

Consider adding model functions to navigate up and down the tree, as DGU use.

No template additions required. Kindly says displaying the hierarchy could lead in lots of directions, so leave this to be done in extensions.

Needs tests.

A bit of documentation would also be helpful here.

tobes · 2013-06-25T09:34:58Z

This would also imply groups too

davidread · 2013-06-25T10:03:20Z

I'm not aware of any use cases for group hierarchies, so had only planned to do it for organizations. The auth is separate and can avoid the option in the form for groups. We might come up against an issue, but our preference is for avoiding worrying about considering the group permissions.

tobes · 2013-06-25T10:17:36Z

organizations are just groups. I'm not saying it needs to be active just reminding that that they co-exist and therefore adding it for one should allow it in the other even if not actually enabled anywhere.

davidread · 2013-06-25T11:17:02Z

Not sure what you mean. The intention is that all of the changes will only apply to 'groups which are organizations' and none will change 'groups which are not organizations'.

…rhaulled.

…ed the sort ordering for some of the group functions.

…test.

davidread · 2013-07-30T15:54:31Z

Have done:

model functions for navigating hierarchy (groups or orgs)
permissions cascading
created ckanext-hierarchy that displays organization tree
With CKAN tests

Yet to do:

Add/remove an org's parent org, via form and API (includes API's organization_create doesn't tell the package's owner_org what organization it belongs to #1057).

I may also look at #1032 and #1145 too.

* Fix - CONFIG_PERMISSIONS were not read properly following my prev changes * Fix deleted child groups being visible. * Fix up a couple of tests

Now member.table_id is the *parent* of member.group_id (not the child). This means the permissions work - a user needs permissions for the member.group_id to change its members, and it makes more sense for a group to choose its parents than its children. This is because a user with rights higher up the tree often gets given automatic rights to groups lower down. If he can also make any other group a child, then he would give himself rights over it. Added test for the group permissions to check it made sense Fixed bug in get_top_level_groups - the 'and' was ignored before. The existing test picked this up. group.get_groups meaning is expanded. Seems to only get used in _group_or_org_update and treats the result as parents. Needs further examination when doing the form work on this ticket.

…['groups'] rather than custom 'parent' Removed explicit creation of Members in the create/update logic functions - these were a hangover. Instead, the form just needs to ensure the parent group gets added to the group['groups'] and it will get set in the model_save as normal. Group.get_group no longer used anywhere (and the caching looked ropey anyway) now that the previous bit is removed. Added schema validator to ensure that no loops form in the hierarchy. Downwards CTE needed ordering as found it also couldn't be relied upon to be in order it recursed, probably due to the join. Removed duplicate 'groups' key in the group schema.

And tidy typos etc.

davidread · 2013-09-18T07:55:59Z

This is complete now. In the end I made it work with both groups and organizations. The related extension for the front-end work is: https://github.com/datagovuk/ckanext-hierarchy and I created a pull request: #1247

… as SQLAlchemy objects.

… as SQLAlchemy objects. Conflicts: ckan/tests/models/test_group.py

* get_parent_groups is used by DGU and no doubt others that use hierarchy. * get_children_groups changed to return objects as that is more convenient for DGU.

* get_parent_groups is used by DGU and no doubt others that use hierarchy. * get_children_groups changed to return objects as that is more convenient for DGU. Conflicts: ckan/tests/models/test_group.py

Conflicts: ckan/model/group.py

…group in the new-package form.

davidread · 2014-01-03T17:29:16Z

Closing, the pull request has been merged master in time for CKAN 2.2. #1247

ghost assigned davidread Jun 24, 2013

davidread pushed a commit to datagovuk/ckan that referenced this issue Jul 22, 2013

[ckan#1038] Correct copyright sign for UTF8 file and cut/paste error.

98888d2

davidread pushed a commit to datagovuk/ckan that referenced this issue Jul 22, 2013

[ckan#1038] Fix to allow sqlite testing - for until the tests are ove…

21cd0ac

…rhaulled.

davidread pushed a commit to datagovuk/ckan that referenced this issue Jul 22, 2013

[ckan#1038] Test fixtures for organization hierarchy.

96f0a3e

davidread pushed a commit to datagovuk/ckan that referenced this issue Jul 22, 2013

[ckan#1038] Model methods for organization hierarchy.

fde50fa

davidread mentioned this issue Jul 30, 2013

organization_update changes all its packages' capacity to 'public' from 'organization' #1145

Closed

davidread pushed a commit to datagovuk/ckan that referenced this issue Jul 30, 2013

[ckan#1038] Test data is now organizations rather than groups.

2c0bbaf

davidread pushed a commit to datagovuk/ckan that referenced this issue Jul 30, 2013

[ckan#1038] Docs for Member and its capacities is most handy. Explain…

1229ff2

…ed the sort ordering for some of the group functions.

davidread pushed a commit to datagovuk/ckan that referenced this issue Jul 30, 2013

[ckan#1038] Permission cascading code with tests.

68bfd7a

davidread pushed a commit to datagovuk/ckan that referenced this issue Jul 30, 2013

[ckan#1038] Fix permission checking for organizations. Corrected bad …

4db2d24

…test.

davidread pushed a commit to datagovuk/ckan that referenced this issue Jul 30, 2013

[ckan#1038] Fix unreliable ordering of upward CTE.

6d97199

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 6, 2013

[ckan#1038] Fix up authz config error and deleted groups

7ce1555

* Fix - CONFIG_PERMISSIONS were not read properly following my prev changes * Fix deleted child groups being visible. * Fix up a couple of tests

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 12, 2013

[ckan#1038] PEP8 fixes only.

f7f5049

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 17, 2013

[ckan#1038] Fix display of tree hierarchy, broken in reversal af6c039.

527f3e9

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 17, 2013

[ckan#1038] Fix group deletion mid-hierarchy.

407cf91

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 17, 2013

[ckan#1038] Config option fixed and documented.

df890fc

And tidy typos etc.

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 17, 2013

[ckan#1038] Fix an apparently botched merge.

e023b44

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 17, 2013

[ckan#1038] Fix an apparently botched merge (cont).

4290821

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 17, 2013

[ckan#1038] Fix an apparently botched merge (cont).

24548c0

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 17, 2013

[ckan#1038] Fix reading config.

fafd9f9

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 23, 2013

[ckan#1038] Fix top level groups including deleted ones.

180f5bf

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 23, 2013

[ckan#1038] Fix top level groups including deleted ones.

b7136b8

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 24, 2013

[ckan#1038] Improve performance of viewing hierarchy, avoiding groups…

ed78fc9

… as SQLAlchemy objects.

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 24, 2013

[ckan#1038] Improve performance of viewing hierarchy, avoiding groups…

b6e7eb2

… as SQLAlchemy objects. Conflicts: ckan/tests/models/test_group.py

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 24, 2013

[ckan#1038] Patch pulled from 1038 branch - this file was missed before.

758502e

davidread pushed a commit to datagovuk/ckan that referenced this issue Sep 24, 2013

[ckan#1038] get_parent_groups added

ce5d410

* get_parent_groups is used by DGU and no doubt others that use hierarchy. * get_children_groups changed to return objects as that is more convenient for DGU.

davidread pushed a commit to datagovuk/ckan that referenced this issue Oct 3, 2013

[ckan#1038] Add a hard limit to recursion - just in case.

d1cff5a

davidread pushed a commit to datagovuk/ckan that referenced this issue Oct 3, 2013

[ckan#1038] Add a hard limit to recursion - just in case.

399a6a4

Conflicts: ckan/model/group.py

kindly added a commit that referenced this issue Nov 7, 2013

[#1038] merge confilcts

b95ef59

davidread pushed a commit to datagovuk/ckan that referenced this issue Dec 9, 2013

[ckan#1038] Fix for python 2.6.

22a3432

davidread pushed a commit to datagovuk/ckan that referenced this issue Dec 9, 2013

[ckan#1038] Simplify code that reads ckan.auth config.

75394f8

davidread pushed a commit to datagovuk/ckan that referenced this issue Dec 9, 2013

[ckan#1038] Fix a bug introduced on this branch, for pre-filling the …

1de51c6

…group in the new-package form.

davidread closed this as completed Jan 3, 2014

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Organization hierarchy #1038

Organization hierarchy #1038

davidread commented Jun 24, 2013

tobes commented Jun 25, 2013

davidread commented Jun 25, 2013

tobes commented Jun 25, 2013

davidread commented Jun 25, 2013

davidread commented Jul 30, 2013

davidread commented Sep 18, 2013

davidread commented Jan 3, 2014

Organization hierarchy #1038

Organization hierarchy #1038

Comments

davidread commented Jun 24, 2013

tobes commented Jun 25, 2013

davidread commented Jun 25, 2013

tobes commented Jun 25, 2013

davidread commented Jun 25, 2013

davidread commented Jul 30, 2013

davidread commented Sep 18, 2013

davidread commented Jan 3, 2014