From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 10 Sep 2013 13:56:45 +0000 (+0000)
Subject: fix broken videos admin
X-Git-Tag: v1.0~34
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=166d3ce34cbbc499e6fe577ab51374bbe0740962;p=web%2FMichiganTrailMaps.git

fix broken videos admin
---

diff --git a/Toolkit/Videos/AdminEditVideoForm.php b/Toolkit/Videos/AdminEditVideoForm.php
index a86785b..71ed4fe 100644
--- a/Toolkit/Videos/AdminEditVideoForm.php
+++ b/Toolkit/Videos/AdminEditVideoForm.php
@@ -131,13 +131,13 @@ class Toolkit_Videos_AdminEditVideoForm
             'req' => false,
             'name' => 'pos'
         );
-        $e[] = array(
-            'type'    => 'select',
-            'req'     => false,
-            'name'    => 'page',
-            'display' => 'Page',
-            'opts'    => array('' => '-- Select --'),
-        );
+//        $e[] = array(
+//            'type'    => 'select',
+//            'req'     => false,
+//            'name'    => 'page',
+//            'display' => 'Page',
+//            'opts'    => array('' => '-- Select --'),
+//        );
         if ($appHasFeaturedVideos) {
             $e[] = array(
                 'type' => 'advcheckbox',
@@ -184,7 +184,7 @@ class Toolkit_Videos_AdminEditVideoForm
 
 		$this->setupElements($e);
 
-        $this->loadPages($dbh);
+//        $this->loadPages($dbh);
 	}
 
     /**
@@ -375,11 +375,7 @@ class Toolkit_Videos_AdminEditVideoForm
         } else {
             $video = new Toolkit_Videos_Video();
         }
-        $page = ($values['page'])
-            ? $values['page']
-            : null;
         $video->setVideo_url($values['video_url'])
-            ->setPage($page)
             ->setFeatured($values['featured'])
             ->setActive($values['active']);
         if ($newPos) {
diff --git a/Toolkit/Videos/Video.php b/Toolkit/Videos/Video.php
index bd10e84..f1c20c7 100644
--- a/Toolkit/Videos/Video.php
+++ b/Toolkit/Videos/Video.php
@@ -29,7 +29,7 @@ class Toolkit_Videos_Video
 
     protected $id;
     protected $video_url;
-    protected $page;
+//    protected $page;
     protected $pos;
     protected $featured;
     protected $active;
diff --git a/Toolkit/Videos/VideosDataGrid.php b/Toolkit/Videos/VideosDataGrid.php
index 1e93d29..8fa210f 100644
--- a/Toolkit/Videos/VideosDataGrid.php
+++ b/Toolkit/Videos/VideosDataGrid.php
@@ -145,16 +145,16 @@ class Toolkit_Videos_VideosDataGrid
             null
             )
         );
-        $this->addColumn(
-            new Structures_DataGrid_Column(
-                'Featured Page',
-                'page_name',
-                null,
-                array('style' => 'width:200px;'),
-                null,
-                null
-            )
-        );
+//        $this->addColumn(
+//            new Structures_DataGrid_Column(
+//                'Featured Page',
+//                'page_name',
+//                null,
+//                array('style' => 'width:200px;'),
+//                null,
+//                null
+//            )
+//        );
 
         $this->addColumn(
             new Structures_DataGrid_Column(
@@ -317,10 +317,8 @@ class Toolkit_Videos_VideosDataGrid
 	public function setQuery()
 	{
 		$sql = "
-        SELECT v.*, p.navigation_name as page_name
-          FROM videos v
-            LEFT OUTER JOIN
-            pages p ON (p.id = v.page)";
+        SELECT *
+          FROM videos";
 		parent::setQuery($sql);
 	}