don't show ratableui on objects that don't exist. Fixes #2

sheadawson · Aug 28, 2015 · e34e3e4 · e34e3e4
1 parent 56d5b20
commit e34e3e4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/code/controllers/RateableController.php b/code/controllers/RateableController.php
@@ -39,7 +39,7 @@ public function rate($request){
 		}
 
 		// check the object exists
-		if(!$object && !$object->EnableRatings){
+		if(!$object && !$object->checkRatingsEnabled()){
 			return Convert::raw2json(array(
 				'status' => 'error',
 				'message' => _t('RateableController.ERRORNOTFOUNT', 'Sorry, the item you are trying to rate could not be found')

diff --git a/code/extensions/Rateable.php b/code/extensions/Rateable.php
@@ -78,7 +78,7 @@ public function UserHasRated(){
 	 * @return String
 	 **/
 	public function RateableUI($htmlIdPostfix = false){
-		if(!$this->owner->EnableRatings) return;
+		if(!$this->owner->checkRatingsEnabled()) return;
 
 		$this->htmlIdPostfix = $htmlIdPostfix;
 
@@ -129,6 +129,15 @@ public function getRatingCSSClass(){
 
 		return implode(' ', $parts);
 	}
+
+
+	/**
+	 * Checks whether ratings should be enabled on this object
+	 * @return Boolean
+	 **/
+	public function checkRatingsEnabled(){
+		return $this->owner->EnableRatings && $this->owner->ID > 0;
+	}
 
 
 	/**