Merge pull request joindin#386 from railto/JOINDIN-647

Add ability to unlink an approved speaker from a talk #JOINDIN-647
MKodde · Jan 8, 2017 · ea82716 · ea82716
2 parents 55062c0 + b7537ac
commit ea82716
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 1 deletion.
diff --git a/app/src/Talk/TalkApi.php b/app/src/Talk/TalkApi.php
@@ -399,4 +399,18 @@ public function removeTalkFromTrack($removeTrackUri)
 
         throw new Exception("Failed to remove talk from track: " . $message);
     }
+
+    public function unlinkVerifiedSpeakerFromTalk($unlinkSpeakerUri)
+    {
+        list($status, $result, $headers) = $this->apiDelete($unlinkSpeakerUri, []);
+
+        if ($status == 204) {
+            return true;
+        }
+
+        $result = json_decode($result);
+        $message = $result[0];
+
+        throw new \Exception("Failed to unlink speaker from talk: " . $message);
+    }
 }
diff --git a/app/src/Talk/TalkController.php b/app/src/Talk/TalkController.php
@@ -32,6 +32,8 @@ protected function defineRoutes(Slim $app)
             ->name('talk-by-id-web1')
             ->conditions(array('talkId' => '\d+'));
         $app->post('/event/:eventSlug/:talkSlug/claim', array($this, 'claimTalk'))->name('talk-claim');
+        $app->get('/event/:eventSlug/:talkSlug/unlink/:username', array($this, 'unlinkSpeaker'))
+            ->name('unlink-speaker');
     }
 
     public function index($eventSlug, $talkSlug)
@@ -442,6 +444,41 @@ public function reportComment($eventSlug, $talkSlug, $commentHash)
         $this->application->redirect($url);
     }
 
+    public function unlinkSpeaker($eventSlug, $talkSlug, $username)
+    {
+        $url = $this->application->urlFor('talk', ['eventSlug' => $eventSlug, 'talkSlug' => $talkSlug]);
+
+        if (!isset($_SESSION['user'])) {
+            $this->application->redirect(
+                $this->application->urlFor('not-allowed') . '?redirect=' . $url
+            );
+        }
+
+        $eventApi = $this->getEventApi();
+        $event = $eventApi->getByFriendlyUrl($eventSlug);
+        $eventUri = $event->getUri();
+
+        $talkApi = $this->getTalkApi();
+        $talk = $talkApi->getTalkBySlug($talkSlug, $eventUri);
+        $talkUri = $talk->getApiUri();
+
+        $userApi = $this->getUserApi();
+        $user = $userApi->getUserByUsername($username);
+        $userId = $user->getId();
+
+        $unlinkSpeakerUri = $talkUri . "/speakers/" . $userId;
+
+        try {
+            $talkApi->unlinkVerifiedSpeakerFromTalk($unlinkSpeakerUri);
+        } catch (Exception $e) {
+            $this->application->flash('error', $e->getMessage());
+            $this->application->redirect($url);
+        }
+
+        $this->application->flash('message', 'Speaker has been removed from this talk.');
+        $this->application->redirect($url);
+    }
+
     /**
      * @return CacheService
      */

diff --git a/app/src/User/UserEntity.php b/app/src/User/UserEntity.php
@@ -158,4 +158,12 @@ public function getAdmin()
 
         return $this->data->admin;
     }
+
+    public function getId()
+    {
+        $uri = $this->data->uri;
+        $parts = explode('/', $uri);
+
+        return $parts[5];
+    }
 }
diff --git a/app/templates/Talk/_common/talk_header.html.twig b/app/templates/Talk/_common/talk_header.html.twig
@@ -20,7 +20,11 @@
                                 {% endif %}
 
                                 {% if speaker.username %}
-                                    <a href="{{ urlFor('user-profile', {'username': speaker.username}) }}">{{ speaker.speaker_name }}</a>{{comma}}
+                                    <a href="{{ urlFor('user-profile', {'username': speaker.username}) }}">{{ speaker.speaker_name }}</a>
+                                    {% if canEditTalk %}
+                                        <a onclick="return confirm('Are you sure you want to unlink this speaker from this talk?')" href="{{ urlFor('unlink-speaker', {'eventSlug': event.getUrlFriendlyName, 'talkSlug': talk.getUrlFriendlyTalkTitle, 'username': speaker.username }) }}"><small>(unlink)</small></a>
+                                    {% endif %}
+                                    {{ comma }}
                                 {% else %}
                                     {{ speaker.speaker_name }}{{comma}}
                                 {% endif %}