Changeset 10322

Timestamp:

Jan 22, 2009, 10:57:14 PM (12 years ago)

Author:

ShogoKawahara

Message:

#3464:added GadgetPeer::getGadgetCongigListByType()

Location:

OpenPNE3/trunk

Files:

• apps/pc_backend/modules/design/actions/actions.class.php (modified) (3 diffs)
• lib/model/Gadget.php (modified) (5 diffs)
• lib/model/GadgetPeer.php (modified) (2 diffs)

OpenPNE3/trunk/apps/pc_backend/modules/design/actions/actions.class.php

@@ -71 +71 @@
         $this->gadgets = array(
           'top'      => GadgetPeer::retrieveTopGadgets(),
-          'sideMenu'     => GadgetPeer::retrieveSideMenuGadgets(),
+          'sideMenu' => GadgetPeer::retrieveSideMenuGadgets(),
           'contents' => GadgetPeer::retrieveContentsGadgets(),
-          'bottom' => GadgetPeer::retrieveBottomGadgets(),
+          'bottom'   => GadgetPeer::retrieveBottomGadgets(),
         );
     }
@@ -122 +122 @@
   public function executeAddGadget(sfWebRequest $request)
   {
-    $validTypes = array('top', 'sideMenu', 'contents', 'bottom', 'mobileTop', 'mobileContents', 'mobileBottom', 'sideBannerContents');
-    $mobileTypes = array('mobileTop', 'mobileContents', 'mobileBottom');
-    $sideBannerTypes = array('sideBannerContents');
-
-    $this->config = sfConfig::get('op_gadget_list', array());
-    $this->type = 'top';
-    if (in_array($request->getParameter('type'), $validTypes))
-    {
-      $this->type = $request->getParameter('type');
-    }
-
-    if (in_array($this->type, $mobileTypes))
-    {
-      $this->config = sfConfig::get('op_mobile_gadget_list', array());
-    }
-    elseif (in_array($this->type, $sideBannerTypes))
-    {
-      $this->config = sfConfig::get('op_side_banner_gadget_list', array());
-    }
+    $this->type = $request->getParameter('type','top');
+    $this->config = GadgetPeer::getGadgetConfigListByType($this->type);
 
     return sfView::SUCCESS;
@@ -154 +137 @@
     $this->gadget = GadgetPeer::retrieveByPK($request->getParameter('id'));
 
-    $mobileTypes = array('mobileTop', 'mobileContents', 'mobileBottom');
-    $sideBannerTypes = array('sideBannerContents');
-
     $type = $this->gadget->getType();
-    $config = sfConfig::get('op_gadget_list', array());
-
-    if (in_array($type, $mobileTypes))
-    {
-      $config = sfConfig::get('op_mobile_gadget_list', array());
-    }
-    elseif (in_array($type, $sideBannerTypes))
-    {
-      $config = sfConfig::get('op_side_banner_gadget_list', array());
-    }
+    $config = GadgetPeer::getGadgetConfigListByType($type);
 
     $this->forward404Unless($this->gadget && $config);

OpenPNE3/trunk/lib/model/Gadget.php

@@ -11 +11 @@
 class Gadget extends BaseGadget
 {
-  protected function getConfigList()
-  {
-    $mobileTypes = array('mobileTop', 'mobileContents', 'mobileBottom');
-    $sideBannerTypes = array('sideBannerContents');
-    if (in_array($this->getType(), $mobileTypes))
-    {
-      $list = sfConfig::get('op_mobile_gadget_list');
-    }
-    elseif(in_array($this->getType(), $sideBannerTypes))
-    {
-      return sfConfig::get('op_side_banner_gadget_list');
-    }
-    return sfConfig::get('op_gadget_list');
-  }
-
   public function save(PropelPDO $con = null)
   {
@@ -47 +32 @@
   public function getComponentModule()
   {
-    $list = $this->getConfigList();
+    $list = GadgetPeer::getGadgetConfigListByType($this->getType());
 
     if (empty($list[$this->getName()]))
@@ -59 +44 @@
   public function getComponentAction()
   {
-    $list = $this->getConfigList();
+    $list = GadgetPeer::getGadgetConfigListByType($this->getType());
 
     if (empty($list[$this->getName()]))
@@ -71 +56 @@
   public function isEnabled()
   {
-    $list = $this->getConfigList();
+    $list = GadgetPeer::getGadgetConfigListByType($this->getType());
     if (empty($list[$this->getName()]))
     {
@@ -83 +68 @@
   {
     $result = null;
-    $list = $this->getConfigList();
+    $list = GadgetPeer::getGadgetConfigListByType($this->getType());
 
     $config = GadgetConfigPeer::retrieveByGadgetIdAndName($this->getId(), $name);

OpenPNE3/trunk/lib/model/GadgetPeer.php

@@ -11 +11 @@
 class GadgetPeer extends BaseGadgetPeer
 {
+  static protected $pcTypes = array('top', 'sideMenu', 'contents', 'bottom');
+
+  static protected $mobileTypes = array('mobileTop', 'mobileContents', 'mobileBottom');
+  
+  static protected $sideBannerTypes = array('sideBannerContents');
+
   static protected $results;
 
@@ -109 +115 @@
     return self::$results;
   }
+
+  static public function getGadgetConfigListByType($type)
+  {
+    if (in_array($type, self::$pcTypes))
+    {
+      return sfConfig::get('op_gadget_list', array());
+    }
+    elseif (in_array($type, self::$mobileTypes))
+    {
+      return sfConfig::get('op_mobile_gadget_list', array());
+    }
+    elseif (in_array($type, self::$sideBannerTypes))
+    {
+      return sfConfig::get('op_side_banner_gadget_list', array());
+    }
+    return array();
+  }
 }