PATCH: bugfixes for methods not found

sunnysideup · May 14, 2018 · 1c82c2c · 1c82c2c
1 parent 96882f4
commit 1c82c2c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/code/extensions/PageRaterExtension.php b/code/extensions/PageRaterExtension.php
@@ -175,7 +175,7 @@ public function CurrentUserRating()
      *
      * @return ArrayList
      */
-    protected function turnPageRaterSQLIntoArrayList($data, $method = "unknown")
+    public function turnPageRaterSQLIntoArrayList($data, $method = "unknown")
     {
         if ($data instanceof SQLQuery) {
             $data = $data->execute();
@@ -197,7 +197,7 @@ protected function turnPageRaterSQLIntoArrayList($data, $method = "unknown")
         return $al;
     }
 
-    protected function onlyShowApprovedPageRatings()
+    public function onlyShowApprovedPageRatings()
     {
         return Config::inst()->get("PageRaterExtension_Controller", "only_show_approved");
     }

diff --git a/code/extensions/PageRaterExtension_Controller.php b/code/extensions/PageRaterExtension_Controller.php
@@ -152,13 +152,13 @@ public function removeallpageratings()
      */
     public function PageRaterListOfAllForPage($paginated = false)
     {
-        if ($this->onlyShowApprovedPageRatings()) {
-            $list = $this->turnPageRaterSQLIntoArrayList(
+        if ($this->owner->onlyShowApprovedPageRatings()) {
+            $list = $this->owner->turnPageRaterSQLIntoArrayList(
                 $this->owner->PageRatings()->filter(array("IsApproved" => 1)),
                 "PageRaterListOfAllForPage"
             );
         } else {
-            $list = $this->turnPageRaterSQLIntoArrayList(
+            $list = $this->owner->turnPageRaterSQLIntoArrayList(
                 $this->owner->PageRatings(),
                 "PageRaterListOfAllForPage"
             );
@@ -173,8 +173,6 @@ public function PageRaterListOfAllForPage($paginated = false)
         return $list;
     }
 
-
-    public function PageRaterListAll()
     {
         $sqlQuery = new SQLQuery();
         $sqlQuery->setSelect("\"PageRating\".\"Rating\" AS RatingAverage, \"PageRating\".\"ParentID\"");
@@ -185,7 +183,7 @@ public function PageRaterListAll()
         $sqlQuery->addInnerJoin("SiteTree", " \"PageRating\".\"ParentID\" = \"SiteTree\".\"ID\"");
         $sqlQuery->setOrderBy("RatingAverage DESC");
         $sqlQuery->setGroupby("\"SiteTree\".\"ParentID\"");
-        return $this->turnPageRaterSQLIntoArrayList($sqlQuery, "PageRaterList");
+        return $this->owner->turnPageRaterSQLIntoArrayList($sqlQuery, "PageRaterList");
     }
 
     /**