[xoops-cvslog 2657] CVS update: xoops2jp/html/modules/base/admin/actions

Back to archive index

Minahito minah****@users*****
2006年 4月 6日 (木) 15:01:47 JST


Index: xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.2	Thu Apr  6 12:38:20 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php	Thu Apr  6 15:01:47 2006
@@ -23,6 +23,13 @@
 		return $handler;
 	}
 
+	function _setupObject()
+	{
+		parent::_setupObject();
+		$this->mObject->loadGroup();
+		$this->mObject->loadBmodule();
+	}
+	
 	function _setupActionForm()
 	{
 		$this->mActionForm =& new Legacy_BlockEditForm();
@@ -38,12 +45,27 @@
 		// lazy loading
 		//
 		$this->mObject->loadModule();
-		$this->mObject->loadGroup();
 		
 		$render->setAttribute('object', $this->mObject);
 		
+		//
+		// Build active modules list and set.
+		//
 		$handler =& xoops_gethandler('module');
-		$moduleArr =& $handler->getObjects();
+		$moduleArr[0] =& $handler->create();
+		$moduleArr[0]->set('mid', -1);
+		$moduleArr[0]->set('name', _AD_BASE_LANG_ALL_MODULES);
+		
+		$moduleArr[1] =& $handler->create();
+		$moduleArr[1]->set('mid', 0);
+		$moduleArr[1]->set('name', _AD_BASE_LANG_TOPPAGE);
+
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('hasmain', 1));
+		$criteria->add(new Criteria('isactive', 1));
+		
+		$t_Arr =& $handler->getObjects($criteria);
+		$moduleArr = array_merge($moduleArr, $t_Arr);
 		$render->setAttribute('moduleArr', $moduleArr);
 		
 		$handler =& xoops_getmodulehandler('columnside');
@@ -55,6 +77,13 @@
 		$render->setAttribute('groupArr', $groupArr);
 		
 		//
+		// Build cachetime list and set.
+		//
+		$handler =& xoops_gethandler('cachetime');
+		$cachetimeArr =& $handler->getObjects();
+		$render->setAttribute('cachetimeArr', $cachetimeArr);
+
+		//
 		// Get html of option form rendered.
 		//
 		if ($this->mObject->get('func_file') && $this->mObject->get('edit_func')) {


xoops-cvslog メーリングリストの案内
Back to archive index