Allow deleting group-content when group is deleted [#1862702]

Comment	File	Size	Author
#18	1862702-og-queue-18.patch	13.04 KB	RoySegall

#16	1862702-og-queue-16.patch	12.88 KB	RoySegall

#12	1862702-og-queue-12.patch	7.02 KB	RoySegall

#9	1862702-og-queue-9.patch	10.25 KB	RoySegall

#6	1862702-og-queue-6.patch	10.16 KB	RoySegall

#5	1862702-og-queue-5.patch	7.02 KB	amitaibu

#4	1862702-og-queue-4.patch	2.68 KB	amitaibu

#4	Screenshot 12:11:12 1:21 PM.png	76.37 KB	amitaibu
#3	1862702-og-queue-3.patch	6.23 KB	amitaibu

#2	1862702-og-queue-2.patch	4.87 KB	amitaibu

Comment #1

amitaibu

Hebrew

Israel

CreditAttribution: amitaibu commented 10 December 2012 at 11:29

Code in branch 1862702

Log in or register to post comments

Comment #2

amitaibu

Hebrew

Israel

CreditAttribution: amitaibu commented 10 December 2012 at 11:51

Status:

Active

» Needs review

File	Size
1862702-og-queue-2.patch	4.87 KB

Uploading for testbot -- needs tests

Log in or register to post comments

Comment #3

amitaibu

Hebrew

Israel

CreditAttribution: amitaibu commented 11 December 2012 at 09:07

File	Size
1862702-og-queue-3.patch	6.23 KB

Patch allows also to move orphan group-content to another group.

Log in or register to post comments

Comment #4

amitaibu

Hebrew

Israel

CreditAttribution: amitaibu commented 11 December 2012 at 11:22

File	Size
Screenshot 12:11:12 1:21 PM.png	76.37 KB
1862702-og-queue-4.patch	2.68 KB

Added UI
21 PM.png

Log in or register to post comments

Comment #5

amitaibu

Hebrew

Israel

CreditAttribution: amitaibu commented 11 December 2012 at 12:32

File	Size
1862702-og-queue-5.patch	7.02 KB

Correct patch...

Log in or register to post comments

Comment #6

RoySegall CreditAttribution: RoySegall commented 12 December 2012 at 10:03

File	Size
1862702-og-queue-6.patch	10.16 KB

Added test for the deleting orphan and fix a bug: content which relate to more then one groups is getting deleted.

Log in or register to post comments

Comment #7

12 December 2012 at 10:09

Status:

Needs review

» Needs work

The last submitted patch, 1862702-og-queue-6.patch, failed testing.

Log in or register to post comments

Comment #8

amitaibu

Hebrew

Israel

CreditAttribution: amitaibu commented 12 December 2012 at 10:14

+++ b/og.moduleundefined
@@ -1518,14 +1518,171 @@ function og_membership_delete_multiple($ids = array()) {
+    if (count($entity_groups) == 1) {

Add comment why we do this.

+++ b/og.testundefined
@@ -1512,3 +1512,91 @@ class OgBehaviorHandlerTestCase  extends DrupalWebTestCase {
+      'group' => 'Organic groups',

Add 'dependencies' => array('advancedqueue');

+++ b/og.testundefined
@@ -1512,3 +1512,91 @@ class OgBehaviorHandlerTestCase  extends DrupalWebTestCase {
+  function testDeleteGroup() {

Add PHPdocs.

+++ b/og.testundefined
@@ -1512,3 +1512,91 @@ class OgBehaviorHandlerTestCase  extends DrupalWebTestCase {
+    $first_group = (object) array(

Use $this->drupalCreateNode().

+++ b/og.testundefined
@@ -1512,3 +1512,91 @@ class OgBehaviorHandlerTestCase  extends DrupalWebTestCase {
+    $wrapper = entity_metadata_wrapper('node', $first_node);

Don't use the wrapper. Use og_group() instead.

+++ b/og.testundefined
@@ -1512,3 +1512,91 @@ class OgBehaviorHandlerTestCase  extends DrupalWebTestCase {
+    // Active the queue.

"Execute manually the queue worker."

+++ b/og.testundefined
@@ -1512,3 +1512,91 @@ class OgBehaviorHandlerTestCase  extends DrupalWebTestCase {
+    $this->assert(!empty($first_node), "The second node is realted to another group and deleted.");

$this->assert($first_node, 'Non-orphan group content not deleted.');

Log in or register to post comments

Comment #9

RoySegall CreditAttribution: RoySegall commented 13 December 2012 at 08:06

File	Size
1862702-og-queue-9.patch	10.25 KB

I run the tests at my local drupal and it's work ok.

Applied fixes.

Log in or register to post comments

Comment #10

RoySegall CreditAttribution: RoySegall commented 13 December 2012 at 08:07

Status:

Needs work

» Needs review

Change status.

Log in or register to post comments

Comment #11

13 December 2012 at 08:12

Status:

Needs review

» Needs work

The last submitted patch, 1862702-og-queue-9.patch, failed testing.

Log in or register to post comments

Comment #12

RoySegall CreditAttribution: RoySegall commented 13 December 2012 at 08:39

Status:

Needs work

» Needs review

File	Size
1862702-og-queue-12.patch	7.02 KB

I returned the dependencies for the getInfo().

Log in or register to post comments

Comment #13

amitaibu

Hebrew

Israel

CreditAttribution: amitaibu commented 13 December 2012 at 10:13

Great. Next test is the "move" feature.
You will need to set the orphan property via hook_entity_delete() in og_test_module

Log in or register to post comments

Comment #14

amitaibu

Hebrew

Israel

CreditAttribution: amitaibu commented 31 December 2012 at 22:29

Status:

Needs review

» Fixed

Committed, thanks.

Log in or register to post comments

Comment #15

amitaibu

Hebrew

Israel

CreditAttribution: amitaibu commented 1 January 2013 at 07:03

Status:

Fixed

» Needs work

Test is missing from tets, reverted commit.

Log in or register to post comments

Comment #16

RoySegall CreditAttribution: RoySegall commented 1 January 2013 at 07:58

Status:

Needs work

» Needs review

File	Size
1862702-og-queue-16.patch	12.88 KB

I added the missing test and worked on the test for moving the nodes to another group.

Log in or register to post comments

Comment #17

amitaibu

Hebrew

Israel

CreditAttribution: amitaibu commented 1 January 2013 at 08:27

Status:

Needs review

» Needs work

+++ b/og.testundefined
@@ -1568,3 +1568,105 @@ class OgBehaviorHandlerTestCase  extends DrupalWebTestCase {
+    // Create a group and relate it to one group.

=> to first group

+++ b/tests/og_test.moduleundefined
@@ -8,9 +8,55 @@
+    ->propertyCondition('nid', $entity->nid, '<>')

Add docs.

Log in or register to post comments

File	Size
1862702-og-queue-18.patch	13.04 KB

Comment #19

amitaibu

Hebrew

Israel

CreditAttribution: amitaibu commented 1 January 2013 at 11:17

Status:

Needs review

» Fixed

Committed, thanks.

Log in or register to post comments

Comment #20

el1_1el CreditAttribution: el1_1el commented 4 January 2013 at 16:20

Thanks all, this seems to work great!

One thing that I'm not personally quite sure how to fix without a SQL statement is that it seems that when I delete groups, the "og_membership" table doesn't seem to get updated and I get a blank entries in Views when using the "OG membership: Group Node from OG membership" relationship for users. It's not difficult to hide them, but I wanted to throw it out there.

Thanks again