Added multitag support #542

sarjona · 2016-05-06T10:59:13Z

By default the code of this module supports more than one tag separated by comma (bpd_tag=tag1, tag2), but it's not possible to select more than one from the filtering page. This patch lets select more than one tags when filtering:

Reviewed styles to show selected tags.
Fixed bug with bp-docs to let AND filter. By default filtering is done with OR clausure.
Added option to select more than one tag from filtering page.
Added link to let users choose if the filter has to include all the tags (AND) or only some of them (OR). For this part, at the moment, it's necessary to add the following in the .po file:

msgid "<strong><a href=\"%s\" title=\"View Docs with some of the selected tags\">View Docs with some of the selected tags</a></strong>"
msgstr ""

msgid "<strong><a href=\"%s\" title=\"View Docs with all selected tags\">View Docs with all selected tags</a></strong>"
msgstr ""

Store the calculated array of protected doc IDs in the `BP_Docs_Access_Query` singleton class to avoid calculating the list more than once.

Adds a new taxonomy to store the comment access setting for each doc. This will allow us to protect comments that should be hidden from the user.

Add comment-specific code to BP_Docs_Access_Query so that we can filter comments based on doc settings.

Two major components: * Filter WP_Comment_Query so that comments on docs are handled according to the doc’s privacy settings. * Protect activity stream items that are created by commenting on a doc.

* Rather than storing this data in the singleton, move to WP cache with dreams of moving to a persistent cache in the future. * Add tests showing that the access protection queries are not duplicated.

Store the calculated array of protected doc IDs in the `BP_Docs_Access_Query` singleton class to avoid calculating the list more than once.

Adds a new taxonomy to store the comment access setting for each doc. This will allow us to protect comments that should be hidden from the user.

Add comment-specific code to BP_Docs_Access_Query so that we can filter comments based on doc settings.

Two major components: * Filter WP_Comment_Query so that comments on docs are handled according to the doc’s privacy settings. * Protect activity stream items that are created by commenting on a doc.

* Rather than storing this data in the singleton, move to WP cache with dreams of moving to a persistent cache in the future. * Add tests showing that the access protection queries are not duplicated.

Sometimes, we need to handle access queries for multiple users on a page load. The existing singleton structure returned the singleton calculated for the first user every time.

If a user shouldn’t be able to see the activity item, don’t send them an email about it either. Adds a filter for the “all email” action and the action that adds activities to the digest queue.

New tests: * Non-logged-in users shouldn’t see logged-in only items. * No one but the author should see creator-only items. * Non-group members shouldn’t see group-member-only items.

… activity-stream-exclusions # Conflicts: # includes/activity.php # tests/test-bp-docs.php

Introduce a `last_changed` incrementor so that restricted doc IDs, comment doc IDs, and comment IDs stay fresh.

Send `bp_docs_update_doc_access()` the right values to work with.

Add test for `get_doc_ids()`. Test protections for docs with read access limited to group admins and mods.

Add tests for `get_restricted_comment_doc_ids()` and `get_comment_ids()`. Test loggedin, creator-only, group members, and group admins and mods protections for docs with limited comment read access and their child comments.

Earlier tests checked that users were prevented from accessing certain docs. These new tests check that user are not prevented from accessing docs to which they should have access.

Mark the changes related to comment and activity item protection as going in at version 2.0, not 1.9.1.

sarjona · 2016-05-06T11:00:31Z

@bosshy

`get_post()` falls back on the `$post` global when the `$post_id` passed to it is empty, so we should be sure not to call the function if the doc ID provided by the activity item is empty. Props to @bosshy for diagnosing the issue. Fixes #536.

…y context. Fixes #537.

This causes problems during unit tests.

… is saved.

See #540.

boonebgorges · 2016-05-06T18:59:00Z

Thank you so much for the pull request! I love the functionality.

A couple questions. First, there are some merge conflicts that are arising, primarily because you are working off of master rather than the latest release branch. (Sorry for not having better documentation of this.) If it's not too much trouble, could you regenerate the PR using the 2.0.x branch? I think the following should do it:

$ git checkout WIP-multitag
$ git checkout -b WIP-multitag-backup
$ git branch -D WIP-multitag
$ git checkout -b WIP-multitag upstream/2.0.x # replace "upstream" with whatever you've called my repo
$ git cherry-pick 5db0b56
$ git push --force origin WIP-multitag

Github should recognize that you're using the same branch name, and update this PR. (If you can't do all of this, we can continue to work off of the current PR.)

On the substance of the PR:

I think the text "You are viewing docs with the following tags" should be modified according to the current boolean. So the default view would be "You are viewing docs with one or more of the following tags", and when the bool=and, it'd be something like "You are viewing docs with each of the following tags". So it'd work kinda like your contextual link "View docs with all selected tags", which I really like.
If you don't mind, could you modify your spacing to match WP formatting standards? https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/#space-usage

Thanks!

sarjona · 2016-05-09T07:07:42Z

Hi!
It's great that you like this functionality! We have recreated the WIP-multitag branch from the last content of 2.0.x branch, we have adapted the strings with your proposal and we have modified the spacing mistakes. So, the WIP-multitag now has to be correct... Please, tell us if you can merge from this PR or if you need we make a new one.
Kind regards!

dcavins added 20 commits March 22, 2016 11:22

Access Query: Store protected doc IDs in singleton.

fa10f28

Store the calculated array of protected doc IDs in the `BP_Docs_Access_Query` singleton class to avoid calculating the list more than once.

Introduce bp_docs_comment_access taxonomy.

18ae587

Adds a new taxonomy to store the comment access setting for each doc. This will allow us to protect comments that should be hidden from the user.

Add doc comment protection to BP_Docs_Access_Query.

7e6a26f

Add comment-specific code to BP_Docs_Access_Query so that we can filter comments based on doc settings.

Enforce doc comment visibility settings.

9308217

Two major components: * Filter WP_Comment_Query so that comments on docs are handled according to the doc’s privacy settings. * Protect activity stream items that are created by commenting on a doc.

Use WP cache to store protected doc and comment IDs.

abde079

* Rather than storing this data in the singleton, move to WP cache with dreams of moving to a persistent cache in the future. * Add tests showing that the access protection queries are not duplicated.

Access Query: Store protected doc IDs in singleton.

faf6f6e

Store the calculated array of protected doc IDs in the `BP_Docs_Access_Query` singleton class to avoid calculating the list more than once.

Introduce bp_docs_comment_access taxonomy.

6cc9c03

Adds a new taxonomy to store the comment access setting for each doc. This will allow us to protect comments that should be hidden from the user.

Add doc comment protection to BP_Docs_Access_Query.

9d16358

Add comment-specific code to BP_Docs_Access_Query so that we can filter comments based on doc settings.

Enforce doc comment visibility settings.

b5a960c

Two major components: * Filter WP_Comment_Query so that comments on docs are handled according to the doc’s privacy settings. * Protect activity stream items that are created by commenting on a doc.

Use WP cache to store protected doc and comment IDs.

0300513

* Rather than storing this data in the singleton, move to WP cache with dreams of moving to a persistent cache in the future. * Add tests showing that the access protection queries are not duplicated.

Make BP_Docs_Access_Query singleton handle multiple users.

a2cea13

Sometimes, we need to handle access queries for multiple users on a page load. The existing singleton structure returned the singleton calculated for the first user every time.

Hide some activity from Group Email Subscription.

a0564c0

If a user shouldn’t be able to see the activity item, don’t send them an email about it either. Adds a filter for the “all email” action and the action that adds activities to the digest queue.

Add tests for the behavior of BP_Docs_Access_Query.

03dcedb

New tests: * Non-logged-in users shouldn’t see logged-in only items. * No one but the author should see creator-only items. * Non-group members shouldn’t see group-member-only items.

Merge remote-tracking branch 'origin/activity-stream-exclusions' into…

fe0c793

… activity-stream-exclusions # Conflicts: # includes/activity.php # tests/test-bp-docs.php

Correct restricted_doc and comment ID caching.

9e14cdd

Introduce a `last_changed` incrementor so that restricted doc IDs, comment doc IDs, and comment IDs stay fresh.

Correct basic bp_docs_access_query tests.

b09c60e

Send `bp_docs_update_doc_access()` the right values to work with.

Add tests for BP_Docs_Access_Query.

290ac04

Add test for `get_doc_ids()`. Test protections for docs with read access limited to group admins and mods.

Add tests for BP_Docs_Access_Query.

750c316

Add tests for `get_restricted_comment_doc_ids()` and `get_comment_ids()`. Test loggedin, creator-only, group members, and group admins and mods protections for docs with limited comment read access and their child comments.

Add more bp_docs_access_query tests.

6ebfe87

Earlier tests checked that users were prevented from accessing certain docs. These new tests check that user are not prevented from accessing docs to which they should have access.

Correct @SInCE tags for comment/activity item protection.

4fb98da

Mark the changes related to comment and activity item protection as going in at version 2.0, not 1.9.1.

sarjona mentioned this pull request May 6, 2016

Cerques multietiqueta projectestac/agora_nodes#371

Closed

boonebgorges and others added 8 commits May 6, 2016 13:48

Readme.

2ec11d9

Allow plugins to force the Folders metabox to be shown in an arbitrar…

4694e5a

…y context. Fixes #537.

Don't attempt to cache htaccess path for the pageload.

2936b08

This causes problems during unit tests.

Don't allow an activity item to be created when an unchanged revision…

369384f

… is saved.

Add @group annotation to attachment tests.

b1040f7

Fix incorrect ID on folder setting element.

b65bf15

when attachments array is empty, use dummy array

43b367a

boonebgorges and others added 7 commits May 6, 2016 13:48

set higher priority for attachment filter

bf96a7d

See #540.

Readme.

fbb1ef8

Added catalan translation

82f36bd

Readme.

116eea4

Tested up to WordPress 4.5.

d0c22f6

Bump stable tag to 1.9.1.

6cdaf64

Update .pot for 1.9.1.

5da3ac2

Added multitag support

55ef7d5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added multitag support #542

Added multitag support #542

sarjona commented May 6, 2016

sarjona commented May 6, 2016

boonebgorges commented May 6, 2016

sarjona commented May 9, 2016

Added multitag support #542

Are you sure you want to change the base?

Added multitag support #542

Conversation

sarjona commented May 6, 2016

sarjona commented May 6, 2016

boonebgorges commented May 6, 2016

sarjona commented May 9, 2016