Revert "Sortable: Allow to check for a particular sort rule"

This reverts commit ae21baa.
Icinga · Jun 26, 2015 · cfd43f2 · cfd43f2
1 parent 0fc8e60
commit cfd43f2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 27 deletions.
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
@@ -341,25 +341,11 @@ public function compare($a, $b, $orderIndex = 0)
     /**
      * Whether an order is set
      *
-     * @param   string  $column
-     *
      * @return bool
      */
-    public function hasOrder($column = null)
+    public function hasOrder()
     {
-        if (empty($this->order)) {
-            return false;
-        } elseif ($column === null) {
-            return true;
-        }
-
-        foreach ($this->order as $rule) {
-            if ($rule[0] === $column) {
-                return true;
-            }
-        }
-
-        return false;
+        return !empty($this->order);
     }
 
     /**

diff --git a/library/Icinga/Data/Sortable.php b/library/Icinga/Data/Sortable.php
@@ -36,11 +36,9 @@ public function order($field, $direction = null);
     /**
      * Whether an order is set
      *
-     * @param   string  $column
-     *
      * @return bool
      */
-    public function hasOrder($column = null);
+    public function hasOrder();
 
     /**
      * Get the order if any

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
@@ -315,13 +315,11 @@ protected function splitOrder($field)
     /**
      * Return whether any sort rules were applied to this query
      *
-     * @param   string  $column
-     *
      * @return  bool
      */
-    public function hasOrder($column = null)
+    public function hasOrder()
     {
-        return $this->query->hasOrder($column);
+        return $this->query->hasOrder();
     }
 
     /**

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -294,13 +294,11 @@ public function order($column = null, $direction = null)
     /**
      * Whether an order is set
      *
-     * @param   string  $column
-     *
      * @return bool
      */
-    public function hasOrder($column = null)
+    public function hasOrder()
     {
-        return $this->query->hasOrder($column);
+        return $this->query->hasOrder();
     }
 
     /**