Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9414] XoopsModules/TDMCreate/branches/timgno/modules/ TDMCreate
|
From: <txm...@us...> - 2012-04-30 13:32:44
|
Revision: 9414
http://xoops.svn.sourceforge.net/xoops/?rev=9414&view=rev
Author: txmodxoops
Date: 2012-04-30 13:32:38 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
Added pagenav
Redirect if there aren't modules
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/building.php
XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/modules.php
XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/italian/admin.php
Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/building.php 2012-04-30 11:26:06 UTC (rev 9413)
+++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/building.php 2012-04-30 13:32:38 UTC (rev 9414)
@@ -204,7 +204,13 @@
case "default":
default:
-
+ $mod_arr = $modulesHandler->getall();
+ $numrowsmod = count( $mod_arr );
+ // Redirect if there aren't modules
+ if ( $numrowsmod == 0 ) {
+ redirect_header('modules.php?op=modules_create', 3, _AM_TDMCREATE_REDIRECT_NOMODULES );
+ }
+
include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
$action = $_SERVER['REQUEST_URI'];
@@ -212,20 +218,7 @@
$mods_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_MODULES, 'modules_name', 'modules_name');
$mods_select->addOptionArray($modulesHandler->getList());
- $form->addElement($mods_select, true);
-
- /*$modules_name = xoops_getModuleHandler('tdmcreate_modules', 'TDMCreate');
- $criteria = new CriteriaCompo(new Criteria('modules_name', $modules_name));
- $criteria->setSort('tables_name');
- $criteria->setOrder('ASC');
- $tbls_name_arr = $tablesHandler->getAll($criteria);
- foreach (array_keys($tbls_name_arr) as $i)
- {
- $tbls_option_name = $tbls_name_arr[$i]->getVar('tables_name');
- }
- $tbls_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_TABLES, 'tables_name', 'tables_name');
- $tbls_select->addOptionArray($tablesHandler->getList($criteria)); // $tbls_option_name
- $form->addElement($tbls_select, false);*/
+ $form->addElement($mods_select, true);
$form->addElement(new XoopsFormHidden('op', 'creation'));
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/modules.php 2012-04-30 11:26:06 UTC (rev 9413)
+++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/modules.php 2012-04-30 13:32:38 UTC (rev 9414)
@@ -93,8 +93,8 @@
$modulesAdmin->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php?op=modules_list', 'list');
echo $modulesAdmin->renderButton();
- $obj =& $modulesHandler->create();
- $form = $obj->getForm();
+ $obj =& $modulesHandler->create();
+ $form = $obj->getForm();
break;
case "modules_edit":
$obj =& $modulesHandler->get($_REQUEST['modules_id']);
@@ -124,11 +124,31 @@
echo $modulesAdmin->renderButton();
$criteria = new CriteriaCompo();
- $criteria->setSort('modules_name');
- $criteria->setOrder('ASC');
- $modules_arr = $modulesHandler->getall($criteria);
+ $criteria->setSort('modules_id ASC, modules_name');
+ $criteria->setOrder('ASC');
$numrows_modules = $modulesHandler->getCount();
-
+ if (isset($_REQUEST['limit'])) {
+ $criteria->setLimit($_REQUEST['limit']);
+ $limit = $_REQUEST['limit'];
+ } else {
+ $criteria->setLimit($GLOBALS['xoopsModuleConfig']['adminperpage']);
+ $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
+ }
+ if (isset($_REQUEST['start'])) {
+ $criteria->setStart($_REQUEST['start']);
+ $start = $_REQUEST['start'];
+ } else {
+ $criteria->setStart(0);
+ $start = 0;
+ }
+ $modules_arr = $modulesHandler->getall($criteria);
+ if ( $numrows > $limit ) {
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ $pagenav = new XoopsPageNav($numrows_modules, $limit, $start, 'start', 'op=list&limit=' . $limit);
+ $pagenav = $pagenav->renderNav(4);
+ } else {
+ $pagenav = '';
+ }
if ( $numrows_modules > 0 )
{
echo '<table width="100%" cellspacing="1" class="outer">';
@@ -165,6 +185,7 @@
echo '</tr>';
}
echo '</table><br><br>';
+ echo "<div class='center'>".$pagenav."</div>";
} else {
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr class="center">';
Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/tables.php 2012-04-30 11:26:06 UTC (rev 9413)
+++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/tables.php 2012-04-30 13:32:38 UTC (rev 9414)
@@ -433,6 +433,13 @@
$tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=tables_create', 'add');
$tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_TOPICS, 'tables.php?op=topics_create', 'add');
echo $tablesAdmin->renderButton();
+
+ $mod_arr = $modulesHandler->getall();
+ $numrowsmod = count( $mod_arr );
+ // Redirect if there aren't modules
+ if ( $numrowsmod == 0 ) {
+ redirect_header('modules.php?op=modules_create', 2, _AM_TDMCREATE_REDIRECT_NOMODULES );
+ }
//Retirer les tables inutiles
$sql = "SELECT tables_id FROM ".$xoopsDB->prefix("tdmcreate_tables")." WHERE tables_modules = 0";
@@ -441,13 +448,34 @@
{
$sql_del = "DELETE FROM ".$xoopsDB->prefix("tdmcreate_tables")." WHERE tables_id = ".$myrow['tables_id']."";
$xoopsDB->queryF($sql_del);
- }
-
- $criteria = new CriteriaCompo();
- $criteria->setSort('modules_name');
- $criteria->setOrder('ASC');
+ }
+
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('modules_id ASC, modules_name');
+ $criteria->setOrder('ASC');
+ $numrows_modules = $modulesHandler->getCount();
+ if (isset($_REQUEST['limit'])) {
+ $criteria->setLimit($_REQUEST['limit']);
+ $limit = $_REQUEST['limit'];
+ } else {
+ $criteria->setLimit($GLOBALS['xoopsModuleConfig']['adminperpage']);
+ $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
+ }
+ if (isset($_REQUEST['start'])) {
+ $criteria->setStart($_REQUEST['start']);
+ $start = $_REQUEST['start'];
+ } else {
+ $criteria->setStart(0);
+ $start = 0;
+ }
$modules_arr = $modulesHandler->getall($criteria);
- $numrows_modules = $modulesHandler->getCount();
+ if ( $numrows > $limit ) {
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ $pagenav = new XoopsPageNav($numrows_modules, $limit, $start, 'start', 'op=list&limit=' . $limit);
+ $pagenav = $pagenav->renderNav(4);
+ } else {
+ $pagenav = '';
+ }
if ( $numrows_modules > 0 )
{
@@ -525,6 +553,7 @@
}
}
echo '</table><br /><br />';
+ echo "<div class='center'>".$pagenav."</div>";
} else {
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr>';
Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/english/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/english/admin.php 2012-04-30 11:26:06 UTC (rev 9413)
+++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/english/admin.php 2012-04-30 13:32:38 UTC (rev 9414)
@@ -193,7 +193,6 @@
define("_AM_TDMCREATE_EDITOR", "Editor:");
//------------ new additions: Ver. 1.15 -----------------------
-
define("_AM_TDMCREATE_ABOUT_WEBSITE_FORUM", "Forum Web Site");
//------------ new additions: Ver. 1.37 -----------------------
@@ -202,4 +201,7 @@
define("_AM_TDMCREATE_TABLES_LIST", "Tables List");
define("_AM_TDMCREATE_TABLES_NEW", "New Table");
define("_AM_TDMCREATE_TABLES_TOPICS", "New Topics");
+
+//------------ new additions: Ver. 1.38 -----------------------
+define("_AM_TDMCREATE_REDIRECT_NOMODULES", "No module created, must create at least one before");
?>
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/italian/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/italian/admin.php 2012-04-30 11:26:06 UTC (rev 9413)
+++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/language/italian/admin.php 2012-04-30 13:32:38 UTC (rev 9414)
@@ -198,4 +198,7 @@
define("_AM_TDMCREATE_TABLES_LIST", "Lista Tabelle");
define("_AM_TDMCREATE_TABLES_NEW", "Nuova Tabella");
define("_AM_TDMCREATE_TABLES_TOPICS", "Nuovo Topics");
+
+//------------ new additions: Ver. 1.38 -----------------------
+define("_AM_TDMCREATE_REDIRECT_NOMODULES", "Nessun modulo creato, è necessario crearne almeno uno prima");
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
