#211 - removed the ListController along with all links to it

alphadevx · Sep 5, 2015 · b3834a1 · b3834a1
1 parent f88ac43
commit b3834a1
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 582 deletions.
diff --git a/Alpha/Controller/ActiveRecordController.php b/Alpha/Controller/ActiveRecordController.php
@@ -647,9 +647,9 @@ protected function renderPageLinks()
         if ($this->startPoint > 1) {
             // handle secure URLs
             if ($this->request->getParam('token', null) != null)
-                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ListController&ActiveRecordType='.$this->activeRecordType.'&start='.($this->startPoint-$config->get('app.list.page.amount'))).'">&lt;&lt;-Previous</a></li>';
+                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\AcitveRecordController&ActiveRecordType='.$this->activeRecordType.'&start='.($this->startPoint-$config->get('app.list.page.amount'))).'">&lt;&lt;-Previous</a></li>';
             else
-                $body .= '<li><a href="/listall/'.urlencode($this->activeRecordType)."/".($this->startPoint-$config->get('app.list.page.amount')).'">&lt;&lt;-Previous</a></li>';
+                $body .= '<li><a href="/records/'.urlencode($this->activeRecordType)."/".($this->startPoint-$config->get('app.list.page.amount')).'">&lt;&lt;-Previous</a></li>';
         } elseif ($this->recordCount > $config->get('app.list.page.amount')){
             $body .= '<li class="disabled"><a href="#">&lt;&lt;-Previous</a></li>';
         }
@@ -660,9 +660,9 @@ protected function renderPageLinks()
             if ($i != ($this->startPoint-1)) {
                 // handle secure URLs
                 if ($this->request->getParam('token', null) != null)
-                    $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ListController&ActiveRecordType='.$this->activeRecordType.'&start='.($i+1)).'">'.$page.'</a></li>';
+                    $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->activeRecordType.'&start='.($i+1)).'">'.$page.'</a></li>';
                 else
-                    $body .= '<li><a href="/listall/'.urlencode($this->activeRecordType)."/".($i+1).'">'.$page.'</a></li>';
+                    $body .= '<li><a href="/records/'.urlencode($this->activeRecordType)."/".($i+1).'">'.$page.'</a></li>';
             } elseif ($this->recordCount > $config->get('app.list.page.amount')) {
                 $body .= '<li class="active"><a href="#">'.$page.'</a></li>';
             }
@@ -673,9 +673,9 @@ protected function renderPageLinks()
         if ($this->recordCount > $end) {
             // handle secure URLs
             if ($this->request->getParam('token', null) != null)
-                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ListController&ActiveRecordType='.$this->activeRecordType.'&start='.($this->startPoint+$config->get('app.list.page.amount'))).'">Next-&gt;&gt;</a></li>';
+                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->activeRecordType.'&start='.($this->startPoint+$config->get('app.list.page.amount'))).'">Next-&gt;&gt;</a></li>';
             else
-                $body .= '<li><a href="/listall/'.urlencode($this->activeRecordType)."/".($this->startPoint+$config->get('app.list.page.amount')).
+                $body .= '<li><a href="/records/'.urlencode($this->activeRecordType)."/".($this->startPoint+$config->get('app.list.page.amount')).
                     '">Next-&gt;&gt;</a></li>';
         } elseif ($this->recordCount > $config->get('app.list.page.amount')) {
             $body .= '<li class="disabled"><a href="#">Next-&gt;&gt;</a></li>';

diff --git a/Alpha/Controller/ArticleController.php b/Alpha/Controller/ArticleController.php
@@ -261,7 +261,7 @@ public function doGET($request)
 
         // handle requests to view a list of articles
         if ($this->mode == 'read') {
-            $listController = new ListController();
+            $listController = new ActiveRecordController();
             $request->addParams(array('ActiveRecordType' => 'Alpha\Model\Article'));#
             $listController->setRequest($request);
             return $listController->doGET($request);
@@ -677,7 +677,7 @@ public function doDELETE($request)
 
                         $body .= '<center>';
 
-                        $temp = new Button("document.location = '".FrontController::generateSecureURL('act=Alpha\Controller\ListController&ActiveRecordType='.get_class($this->BO))."'",
+                        $temp = new Button("document.location = '".FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.get_class($this->BO))."'",
                             'Back to List','cancelBut');
                         $body .= $temp->render();
 

diff --git a/Alpha/Controller/DEnumController.php b/Alpha/Controller/DEnumController.php
@@ -59,7 +59,7 @@
  * </pre>
  *
  */
-class DEnumController extends ListController implements ControllerInterface
+class DEnumController extends ActiveRecordController implements ControllerInterface
 {
     /**
      * Trace logger

diff --git a/Alpha/Controller/Front/FrontController.php b/Alpha/Controller/Front/FrontController.php
@@ -25,7 +25,6 @@
 use Alpha\Controller\GenSecureQueryStringController;
 use Alpha\Controller\ImageController;
 use Alpha\Controller\ListActiveRecordsController;
-use Alpha\Controller\ListController;
 use Alpha\Controller\LogController;
 use Alpha\Controller\LoginController;
 use Alpha\Controller\LogoutController;
@@ -218,11 +217,6 @@ public function __construct()
             return $controller->process($request);
         });
 
-        $this->addRoute('/listall/{ActiveRecordType}/{start}/{limit}', function($request) {
-            $controller = new ListController();
-            return $controller->process($request);
-        })->value('start', 1)->value('limit', $config->get('app.list.page.amount'));
-
         $this->addRoute('/log/{logPath}', function($request) {
             $controller = new LogController();
             return $controller->process($request);