Fix #1599 consistency when joining moderated-membership comm (#1803)

* Fix #1599 consistency when joining moderated-membership comm Contextual hover now shows accept instead of join if you have a pending invitation. * Issue #1599 contextual hover community moving var scope
dreamwidth · Jun 18, 2016 · e2141a1 · e2141a1
1 parent a985659
commit e2141a1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/cgi-bin/DW/Controller/RPC/MiscLegacy.pm b/cgi-bin/DW/Controller/RPC/MiscLegacy.pm
@@ -94,6 +94,8 @@ sub change_relation_handler {
             unless $remote->can_leave( $targetu, errref => \$error );
 
         $success = $remote->leave_community( $targetu );
+    } elsif ( $action eq 'accept' ) {
+        $success = $remote->accept_comm_invite( $targetu );
     } elsif ( $action eq 'setBan' ) {
         my $list_of_banned = LJ::load_rel_user( $remote, 'B' ) || [];
 
@@ -237,10 +239,13 @@ sub ctxpopup_handler {
     if ($u->is_comm) {
         $ret{url_joincomm}   = "$LJ::SITEROOT/circle/" . $u->{user} . "/edit";
         $ret{url_leavecomm}  = "$LJ::SITEROOT/circle/" . $u->{user} . "/edit";
+        $ret{url_acceptinvite}  = "$LJ::SITEROOT/manage/invites";
         $ret{is_member} = $remote->member_of( $u ) if $remote;
         $ret{is_closed_membership} = $u->is_closed_membership;
+        my $pending = $remote ? ( $remote->get_pending_invites || [] ) : [];
+        $ret{is_invited} = ( grep { $_->[0] == $u->id } @$pending ) ? 1 : 0;
 
-        push @actions, 'join', 'leave';
+        push @actions, 'join', 'leave', 'accept';
     }
 
     # generate auth tokens

diff --git a/htdocs/js/contextualhover.js b/htdocs/js/contextualhover.js
@@ -333,14 +333,20 @@ ContextualPopup.renderPopup = function (ctxPopupId) {
             if (!data.is_closed_membership || data.is_member) {
                 var membershipLink  = document.createElement("a");
 
-                var membership_action = data.is_member ? "leave" : "join";
+                var membership_action;
 
                 if (data.is_member) {
                     membershipLink.href = data.url_leavecomm;
                     membershipLink.innerHTML = "Leave";
+                    membership_action = "leave";
+                } else if (data.is_invited) {
+                    membershipLink.href = data.url_acceptinvite;
+                    membershipLink.innerHTML = "Accept invitation";
+                    membership_action = "accept";
                 } else {
                     membershipLink.href = data.url_joincomm;
                     membershipLink.innerHTML = "Join community";
+                    membership_action = "join";
                 }
 
                 if (!ContextualPopup.disableAJAX) {

diff --git a/htdocs/js/jquery.contextualhover.js b/htdocs/js/jquery.contextualhover.js
@@ -285,6 +285,8 @@ _renderPopup: function() {
         if ( ! data.is_closed_membership || data.is_member ) {
             if ( data.is_member )
                 this._addAction( data.url_leavecomm, "Leave", "leave" );
+            else if ( data.is_invited )
+                this._addAction( data.url_acceptinvite, "Accept invitation", "accept");
             else
                 this._addAction( data.url_joincomm, "Join community", "join" );
         } else {