Merge pull request #65 from christophetd/delete-review

Delete reviews

Author: hmil

app/controllers/CourseController.php

@@ -221,12 +221,12 @@ public function updateReview($slug, $courseId) {
 		$review->content_grade = Input::get('content_grade');
 		$review->difficulty = Input::get('difficulty');
 
-    $msg = trans('courses.review-updated-message');
+    	$msg = trans('courses.review-updated-message');
 
 		if (Input::get('anonymous') == true) {
-      $review->is_anonymous = 1;
-      $review->status = 'waiting';
-      $msg = trans('courses.review-updated-anonymous-message');
+	      $review->is_anonymous = 1;
+	      $review->status = 'waiting';
+	      $msg = trans('courses.review-updated-anonymous-message');
 		}
 
 		$review->updateAverage();
@@ -238,4 +238,19 @@ public function updateReview($slug, $courseId) {
 		return $courseRedirect
 				->with('message', ['success', $msg]);
 	}
+
+	public function deleteReview($slug, $courseId, $reviewId) {
+		$review = Review::findOrFail($reviewId);
+		$courseRedirect = Redirect::action('CourseController@show', [$slug, $courseId]);
+
+		// Check authorized
+		if ($review->student_id != StudentInfo::getId()) {
+			return $courseRedirect
+				->with('message', ['danger', trans('courses.review-delete-not-allowed')]);
+		}
+
+		$review->delete();
+		return $courseRedirect
+			->with('message', ['success', trans('courses.review-deleted-message')]);
+	}
 }

app/lang/en/courses.php

@@ -71,6 +71,8 @@
   'review-updated-message' => 'Your review has been successfuly edited',
   'review-updated-anonymous-message' => 'Your review has been edited. It will now be reviewed by an administrator',
   'review-update-not-allowed' => 'You are not allowed to edit this review.',
+  'review-delete-not-allowed' => 'You are not allowed to delete this review.',
+  'review-deleted-message' => 'Your review has been successfuly deleted.',
 
   'teacher-more-info' => 'More about :teacher',
   'teacher-courses-heading' => ':teacher teaches the following courses'

app/lang/fr/courses.php

@@ -72,6 +72,8 @@
   'review-updated-message' => 'Ton avis a été édité.',
   'review-updated-anonymous-message' => 'Ton avis a été édité. Il doit maintenant être validé par un modérateur.',
   'review-update-not-allowed' => 'Impossible d\'éditer cet avis',
+  'review-delete-not-allowed' => 'Impossible de supprimer cet avis',
+  'review-deleted-message' => 'L\'avis a bien été supprimé',
 
   'teacher-more-info' => 'En savoir plus sur :teacher',
   'teacher-courses-heading' => ':teacher enseigne les cours suivants'

app/routes.php

@@ -14,6 +14,8 @@
 
 /* PATTERNS */
 Route::pattern('id', '\d+');
+Route::pattern('courseId', '\d+');
+Route::pattern('reviewId', '\d+');
 Route::pattern('slug', '[a-zA-Z0-9_\-\.]+');
 
 
@@ -56,6 +58,7 @@
 		Route::get('/dashboard', 'StudentController@dashboard');
 		Route::post('/course/{slug}-{id}/createReview', 'CourseController@createReview');
 		Route::post('/course/{slug}-{id}/updateReview', 'CourseController@updateReview');
+		Route::get('/course/{slug}-{courseId}/deleteReview/{reviewId}', 'CourseController@deleteReview');
 	});
 
 });

app/views/courses/show.blade.php

@@ -152,7 +152,7 @@
 
             	<div class="review">
                 @if (Tequila::isLoggedIn() && StudentInfo::getSciper() == $review->student->sciper)
-                <span class="pull-right">
+                <span class="pull-right actions">
                   <a href="#"
                     data-review-id="{{{ $review->id }}}"
                     data-review-lectures-grade="{{{ $review->lectures_grade }}}"
@@ -163,6 +163,14 @@
                     data-review-anonymous="{{{ $review->is_anonymous ? 1 : 0 }}}"
                     class="edit-review" title="{{{ trans('courses.edit-reviews-action') }}}">
                     <i class="fa fa-pencil"></i>
+
+                  <a href="{{{ action("CourseController@deleteReview", [
+                    'reviewId'=> $review->id,
+                    'courseId'=> $course->id,
+                    'slug'    => $slug
+                    ]) }}}">
+                    <i class="fa fa-trash-o"></i>
+                  </a>
                   </a>
                 @endif
                 </span>

assets/style/courseadvisor.less

@@ -325,7 +325,11 @@ hr {
         padding-left: 15px;
         margin-bottom: 5px;
     }
-    // border-bottom: 1px @hr-border solid;
+
+    .actions a {
+        color: black;
+        margin-right: 10px;
+    }
     margin-bottom: 10px;
 }