From f1fbeaa996645d50b490d1e2def3bf624383b4be Mon Sep 17 00:00:00 2001
From: SecretR <secretr@e107.org>
Date: Wed, 9 Jul 2014 19:24:07 +0300
Subject: [PATCH] Closes #693 - custom pages quick view link broken

---
 e107_admin/cpage.php           | 33 ++++++++++++++++++++++++++++++---
 e107_handlers/form_handler.php |  6 +++---
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index fcd8bb855..d4fef73e7 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -416,7 +416,13 @@ class page_admin_ui extends e_admin_ui
 		protected $pluginName   	= 'core';
 		protected $table        	= "page";
 		
-		protected $listQry      	= "SELECT p.*,u.user_id,u.user_name FROM #page AS p LEFT JOIN #user AS u ON p.page_author = u.user_id WHERE p.page_title != '' "; // without any Order or Limit.
+		protected $listQry      	= "SELECT
+		                                    p.*,u.user_id,u.user_name,pch.chapter_sef,pbk.chapter_sef AS book_sef
+		                               FROM #page AS p
+		                               LEFT JOIN #user AS u ON p.page_author = u.user_id
+		                               LEFT JOIN #page_chapters AS pch ON p.page_chapter = pch.chapter_id
+		                               LEFT JOIN #page_chapters AS pbk ON pch.chapter_parent = pbk.chapter_id
+		                               WHERE p.page_title != '' "; // without any Order or Limit.
 		//protected $editQry = "SELECT * FROM #comments WHERE comment_id = {ID}";
 		
 		protected $pid 				= "page_id";
@@ -429,7 +435,7 @@ class page_admin_ui extends e_admin_ui
 		protected $sortField		= 'page_order';
 		protected $orderStep 		= 10;
 		//protected $url         	= array('profile'=>'page/view', 'name' => 'page_title', 'description' => '', 'link'=>'{e_BASE}page.php?id=[id]'); // 'link' only needed if profile not provided. 
-		protected $url         		= array('route'=>'page/view/index', 'vars' => array('id' => 'page_id', 'name' => 'page_sef'), 'name' => 'page_title', 'description' => ''); // 'link' only needed if profile not provided. 
+		protected $url         		= array('route'=>'page/view/index', 'vars' => array('id' => 'page_id', 'name' => 'page_sef', 'chapter' => 'chapter_sef', 'book' => 'book_sef'), 'name' => 'page_title', 'description' => ''); // 'link' only needed if profile not provided.
 		protected $tabs		 		= array("Page","Page Options","Menu", "Menu Options");
 		protected $featurebox		= array('name'=>'page_title', 'description'=>'page_text', 'image' => 'menu_image', 'visibility' => 'page_class', 'url' => true);
 		
@@ -518,7 +524,7 @@ class page_admin_ui extends e_admin_ui
 					e107::getDb()->update('page',"menu_name = '' WHERE page_id=".intval($key)." LIMIT 1");
 				}
 			}
-			
+
 			// USED IN Menu LIST/INLINE-EDIT MODE ONLY. 
 			if($this->getMode() == 'menu' && ($this->getACtion() == 'list' || $this->getACtion() == 'inline'))
 			{
@@ -602,7 +608,28 @@ class page_admin_ui extends e_admin_ui
 		}
 
 
+        /**
+         * Overrid
+         */
+        public function ListObserver()
+        {
+            parent::ListObserver();
 
+            // fix current url config limitation
+            $tree = $this->getTreeModel();
+
+            /** @var e_admin_model $model */
+            foreach ($tree->getTree() as $id => $model)
+            {
+                // No chapter, override route
+                if(!$model->get('page_chapter'))
+                {
+                    $urlData = $this->url;
+                    $urlData['route'] = 'page/view/other';
+                    $model->setUrl($urlData);
+                }
+            }
+        }
 
 		function afterCreate($newdata,$olddata, $id)
 		{
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 34fff904e..e23d31efc 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -116,8 +116,8 @@ class e_form
 			$class = "class='".$options['class']."'";
 		}
 		else  // default 
-		{
-			$class= "class='form-horizontal'"; 
+		{
+			$class= "class='form-horizontal'"; 
 		}
 		
 		if(isset($options['autocomplete'])) // leave as isset()
@@ -2781,7 +2781,7 @@ class e_form
                     {
                     	$model = $this->getController()->getListModel();
 						// copy url config
-						$model->setUrl($this->getController()->getUrl());
+						if(!$model->getUrl()) $model->setUrl($this->getController()->getUrl());
 						// assemble the url
                     	$link = $model->url();
                     }