Posted by Grayside on February 8, 2011 at 9:57pm
4 followers
| Project: | Organic groups |
| Version: | 6.x-2.x-dev |
| Component: | og.module |
| Category: | feature request |
| Priority: | normal |
| Assigned: | Unassigned |
| Status: | closed (fixed) |
Issue Summary
Attached patch changes og_subscribe_link() to return a string "Awaiting approval" for users that have already requested membership to the given group. It also changes the subscription form submit button to "Request membership" for moderated groups, instead of simply "Join".
| Attachment | Size | Status | Test result | Operations |
|---|---|---|---|---|
| og.awaiting.patch | 3.04 KB | Idle | FAILED: [[SimpleTest]]: [MySQL] Unable to apply patch og.awaiting.patch. This may be a -p0 (old style) patch, which is no longer supported by the testbots. | View details |
Comments
#1
Same basic approach, but this one relies on og_get_subscriptions() to actually control the database interaction. The goal with this approach is to domino the $reset as thoroughly as possible. Downside: slightly more intensive the first time you run og_is_group_member.
#2
That last one was a bit screwy. This replaces #1, and is competing with #0.
#3
@Grayside,
Thanks, can you add a simpletest to check the new API function?
#4
@Amitaibu
I will try to get to writing a test this week.
#5
I've tweaked the og.subscribe.test on account of some of the changes, but I am trying to determine the best way to test og_is_pending_member(). It strikes me that testing og_subscribe_link() thoroughly would include testing that. Not sure what the best approach would be to get og_subscribe_link rendered on the screen. Any suggestions?
#6
og_is_pending_member() is an API function, so the test doesn't need to run through the UI. It would be nice, though, to also have a test to the UI part.
#7
So not a SimpleTest? Or am I confused? Not really sure how to even test the UI, unless I turn on the PHP module and create a node special for it.
Attached patch modifies an existing test to play nice with the changes. It does not properly address og_is_pending_member(), but I wanted to get the modification into the issue.
#8
Grayside will be updating the patch to not re-use $gid inside og_is_pending_member causing it to return incorrectly first call sometimes.
#9
Reroll and tweak of #2.
#10
Combined patch, incremented forward some. Test is failing in an incomplete state, but no more time tonight for debug.
#11
Another increment forward on tests. Somewhat better code reuse, better encapsulation of group membership assertion, but still erroring out, now with a mysterious DB error followed by a no-argument warning.
#12
Got it.
#13
Testbot seems jammed, but testing well on my local.
New patch adds a test for og_is_pending_member(), and wonder of wonders, fixes a bug with that function!
#14
Testbot approved. Setting to RTBC to create a shortlist of things I think are ready to commit with a quick second nomination.
#15
http://drupalcode.org/project/og.git/commit/8a47a65
#16
Automatically closed -- issue fixed for 2 weeks with no activity.