Created
May 16, 2014 16:54
-
-
Save mmcgahan/e14e4d65da3036c84b08 to your computer and use it in GitHub Desktop.
send to chapter_private on both platforms
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/com/meetup/action/ChapterMemberProfile.java b/src/com/meetup/action/ChapterMemberProfile.java | |
index be4ff09..1138ac4 100644 | |
--- a/src/com/meetup/action/ChapterMemberProfile.java | |
+++ b/src/com/meetup/action/ChapterMemberProfile.java | |
@@ -64,6 +64,14 @@ public class ChapterMemberProfile extends ChapterAction { | |
if (U.isEmpty(op)) | |
op = "index"; | |
+ // if group is private, only members can see | |
+ // unless a pending member is looking at their own profile | |
+ if( state.getChapter().getIsPrivate() && | |
+ !state.getMember().getIsMember() && | |
+ !( state.getMember().getIsGroupPending() && state.getMember().getMemberId().equals( web.getInt( "memberId" ) ) ) ) { | |
+ return mapping.findForward( "chapter_private" ); | |
+ } | |
+ | |
// Short circuit unnecessary action stuff now that mobile is done with meetstache. Bug 41299 | |
if ( !state.getMobile() ) { | |
@@ -81,15 +89,7 @@ public class ChapterMemberProfile extends ChapterAction { | |
} | |
} | |
- // if group is private, only members can see | |
- // unless a pending member is looking at their own profile | |
- if( state.getChapter().getIsPrivate() && | |
- !state.getMember().getIsMember() && | |
- !( state.getMember().getIsGroupPending() && state.getMember().getMemberId().equals( web.getInt( "memberId" ) ) ) ) { | |
- return mapping.findForward( "chapter_private" ); | |
- } | |
- | |
- // make sure only Orgs and orig member can see rsvp | |
+ // make sure only Orgs and orig member can see rsvp | |
if ( state.getContext().getIsChapter() && "rsvps".equals( op ) && | |
! ( state.getMember().getIsCoordinator() || ( state.getMember().getIsLoggedIn() && member.getMemberId().equals( web.getInt( "memberId" ) ) ) ) ) { | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment