list up only visible modules

XoopsX · Feb 8, 2013 · bbdc910 · bbdc910
1 parent 280496f
commit bbdc910
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/html/modules/legacy/admin/actions/BlockListAction.class.php b/html/modules/legacy/admin/actions/BlockListAction.class.php
@@ -81,6 +81,12 @@ function executeViewIndex(&$controller, &$xoopsUser, &$render)
 		// naao added
 		$root =& XCube_Root::getSingleton();
 		$render->setAttribute('selectedMid', $root->mContext->mRequest->getRequest('selmid'));
+		$module_handler =& xoops_gethandler('module');
+		$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
+		$criteria->add(new Criteria('isactive', 1));
+		$criteria->add(new Criteria('weight', 0, '>'));
+		$view_modules = $module_handler->getObjects($criteria);
+		$render->setAttribute('view_modules', $view_modules);
 
 		//
 		// Load cache-time pattern objects and set.

diff --git a/html/modules/legacy/admin/templates/block_list.html b/html/modules/legacy/admin/templates/block_list.html
@@ -53,7 +53,7 @@ <h3 class="admintitle"><{$smarty.const._MI_LEGACY_MENU_BLOCKLIST}></h3>
   <select name="selmid">
     <option value="0"><{$smarty.const._AD_LEGACY_LANG_ALL_MODULES}></option>
     <option value="-1" <{if $selectedMid == -1}>selected="selected"<{/if}>><{$smarty.const._AD_LEGACY_LANG_TOPPAGE}></option>
-    <{foreach from=$modules item=module}>
+    <{foreach from=$view_modules item=module}>
         <option value="<{$module->getVar('mid')}>" <{if $module->getVar('mid') == $selectedMid}>selected="selected"<{/if}>>
         <{$module->getVar('name')}></option>
     <{/foreach}>