From e8a65561680b518e29bd96004ef132cdb1db913f Mon Sep 17 00:00:00 2001 From: Ian Gilfillan Date: Tue, 19 Jul 2016 19:24:50 +0000 Subject: Only allow active distributions to be added, increase visible issues --- .../Application/Controllers/IssuesController.php | 6 +- h-source/Application/Include/distributions.php | 7 ++- h-source/MySQL_changelog/436_to_442_update_sql.sql | 46 +++++++++++++++ h-source/tables.sql | 69 +++++++++++----------- 4 files changed, 89 insertions(+), 39 deletions(-) create mode 100644 h-source/MySQL_changelog/436_to_442_update_sql.sql (limited to 'h-source') diff --git a/h-source/Application/Controllers/IssuesController.php b/h-source/Application/Controllers/IssuesController.php index 9c7b799..6f7b74b 100644 --- a/h-source/Application/Controllers/IssuesController.php +++ b/h-source/Application/Controllers/IssuesController.php @@ -111,10 +111,10 @@ class IssuesController extends BaseController $recordNumber = $this->m['IssuesModel']->rowNumber(); $page = $this->viewArgs['page']; //set the limit clause - $this->m['IssuesModel']->limit = $this->h['Pages']->getLimit($page,$recordNumber,20); + $this->m['IssuesModel']->limit = $this->h['Pages']->getLimit($page,$recordNumber,30); $data['table'] = $this->m['IssuesModel']->select('issues.*,messages.message,count(*) as numb_mess')->send(); - $data['pageList'] = $this->h['Pages']->render($page-3,7); + $data['pageList'] = $this->h['Pages']->render($page-4,10); $this->append($data); $this->load('viewall'); @@ -200,4 +200,4 @@ class IssuesController extends BaseController } } -} \ No newline at end of file +} diff --git a/h-source/Application/Include/distributions.php b/h-source/Application/Include/distributions.php index 048d1d9..e8c61f0 100644 --- a/h-source/Application/Include/distributions.php +++ b/h-source/Application/Include/distributions.php @@ -25,6 +25,8 @@ class Distributions public static $allowed = array(); + public static $allowed_active = array(); + public static function getList() { return implode(' , ',array_keys(self::$allowed)); @@ -36,6 +38,7 @@ class Distributions $distros = new DistrosModel(); self::$allowed = $distros->clear()->toList("clean_name","full_name")->orderBy("id_order")->send(); + self::$allowed_active = $distros->clear()->where(array('active'=>'1'))->toList("clean_name","full_name")->orderBy("id_order")->send(); } public static function getName($distList = '') @@ -73,7 +76,7 @@ class Distributions { $str = "
"; $str .= "
"; - foreach (self::$allowed as $value => $label) + foreach (self::$allowed_active as $value => $label) { $str .= "
$label
"; } @@ -85,4 +88,4 @@ class Distributions return $str; } -} \ No newline at end of file +} diff --git a/h-source/MySQL_changelog/436_to_442_update_sql.sql b/h-source/MySQL_changelog/436_to_442_update_sql.sql new file mode 100644 index 0000000..b5d33be --- /dev/null +++ b/h-source/MySQL_changelog/436_to_442_update_sql.sql @@ -0,0 +1,46 @@ +-- Apply these queries in order to update your database from revision 436 to revision 442 + +drop table distros; + +create table distros ( + id_distro INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, + creation_date timestamp default CURRENT_TIMESTAMP, + clean_name varchar(200) CHARACTER SET utf8 not null, + full_name varchar(200) CHARACTER SET utf8 not null, + id_order INT UNSIGNED NOT NULL, + active tinyint(1) NOT NULL DEFAULT 1 +)engine=innodb; + +insert into distros (clean_name, full_name, id_order) values ('blag_90001', 'BLAG 90001', 1, 0); +insert into distros (clean_name, full_name, id_order) values ('blag_120000', 'BLAG 120000', 2, 0); +insert into distros (clean_name, full_name, id_order) values ('blag_140000', 'BLAG 1400000', 3, 1); +insert into distros (clean_name, full_name, id_order) values ('debian', 'Debian GNU/Linux Testing/Unstable', 4, 1); +insert into distros (clean_name, full_name, id_order) values ('debian_6', 'Debian GNU/Linux 6 squeeze', 5, 1); +insert into distros (clean_name, full_name, id_order) values ('debian_7', 'Debian GNU/Linux 7 wheezy', 6, 1); +insert into distros (clean_name, full_name, id_order) values ('debian_8', 'Debian GNU/Linux 8 jessie', 7, 1); +insert into distros (clean_name, full_name, id_order) values ('dragora_1_1', 'Dragora 1.1', 8, 0); +insert into distros (clean_name, full_name, id_order) values ('dragora_2_0', 'Dragora 2.0 Ardi', 9, 0); +insert into distros (clean_name, full_name, id_order) values ('dragora_2_2', 'Dragora 2.2 Rafaela', 10, 0); +insert into distros (clean_name, full_name, id_order) values ('dynebolic_2_5_2', 'Dyne:bolic 2.5.2 DHORUBA', 11, 0); +insert into distros (clean_name, full_name, id_order) values ('dynebolic_3_0_X', 'Dyne:III 3.0.X MUNIR', 12, 0); +insert into distros (clean_name, full_name, id_order) values ('gnewsense_2_3', 'gNewSense 2.3 Deltah', 13, 0); +insert into distros (clean_name, full_name, id_order) values ('gnewsense_3_0', 'gNewSense 3.0 Metad (beta)', 14, 0); +insert into distros (clean_name, full_name, id_order) values ('gnewsense_3_0_parkes', 'gNewSense 3.0 Parkes', 15), 0; +insert into distros (clean_name, full_name, id_order) values ('gnewsense_4_0', 'gNewSense 4.0 Ucclia', 16, 1); +insert into distros (clean_name, full_name, id_order) values ('guix_0_10', 'GuixSD 0.10', 17, 1); +insert into distros (clean_name, full_name, id_order) values ('musix_2_0', 'Musix GNU+Linux 2.0 R0', 18, 0); +insert into distros (clean_name, full_name, id_order) values ('musix_3_0_1', 'Musix GNU+Linux 3.0.1', 19, 0); +insert into distros (clean_name, full_name, id_order) values ('parabola', 'Parabola GNU/Linux', 20, 1); +insert into distros (clean_name, full_name, id_order) values ('trisquel_3_5', 'Trisquel 3.5 Awen', 21, 0); +insert into distros (clean_name, full_name, id_order) values ('trisquel_4_0', 'Trisquel 4.0 Taranis', 22, 0); +insert into distros (clean_name, full_name, id_order) values ('trisquel_4_5', 'Trisquel 4.5 Slaine', 23, 0); +insert into distros (clean_name, full_name, id_order) values ('trisquel_5_0', 'Trisquel 5.0 Dagda', 24, 0); +insert into distros (clean_name, full_name, id_order) values ('trisquel_5_5', 'Trisquel 5.5 Brigantia', 25, 0); +insert into distros (clean_name, full_name, id_order) values ('trisquel_6_0', 'Trisquel 6.0 Toutatis', 26, 1); +insert into distros (clean_name, full_name, id_order) values ('trisquel_7_0', 'Trisquel 7.0 Belenos', 27, 1); +insert into distros (clean_name, full_name, id_order) values ('ututo_xs_2009', 'UTUTO XS 2009', 28, 0); +insert into distros (clean_name, full_name, id_order) values ('ututo_xs_2010', 'UTUTO XS 2010', 29, 0); +insert into distros (clean_name, full_name, id_order) values ('ututo_xs_2012_04', 'UTUTO XS 2012.04', 30, 0); +insert into distros (clean_name, full_name, id_order) values ('venenux_0_8', 'VENENUX 0.8', 31, 0); +insert into distros (clean_name, full_name, id_order) values ('venenux_0_8_2', 'VENENUX-EC 0.8.2', 32, 0); +insert into distros (clean_name, full_name, id_order) values ('venenux_0_9', 'VENENUX 0.9', 33, 0); diff --git a/h-source/tables.sql b/h-source/tables.sql index 8a8fe81..a6762e3 100644 --- a/h-source/tables.sql +++ b/h-source/tables.sql @@ -561,42 +561,43 @@ create table distros ( creation_date timestamp default CURRENT_TIMESTAMP, clean_name varchar(200) CHARACTER SET utf8 not null, full_name varchar(200) CHARACTER SET utf8 not null, - id_order INT UNSIGNED NOT NULL + id_order INT UNSIGNED NOT NULL, + active tinyint(1) NOT NULL DEFAULT 1 )engine=innodb; -insert into distros (clean_name, full_name, id_order) values ('blag_90001', 'BLAG 90001', 1); -insert into distros (clean_name, full_name, id_order) values ('blag_120000', 'BLAG 120000', 2); -insert into distros (clean_name, full_name, id_order) values ('blag_140000', 'BLAG 1400000', 3); -insert into distros (clean_name, full_name, id_order) values ('debian', 'Debian GNU/Linux Testing/Unstable', 4); -insert into distros (clean_name, full_name, id_order) values ('debian_6', 'Debian GNU/Linux 6 squeeze', 5); -insert into distros (clean_name, full_name, id_order) values ('debian_7', 'Debian GNU/Linux 7 wheezy', 6); -insert into distros (clean_name, full_name, id_order) values ('debian_8', 'Debian GNU/Linux 8 jessie', 7); -insert into distros (clean_name, full_name, id_order) values ('dragora_1_1', 'Dragora 1.1', 8); -insert into distros (clean_name, full_name, id_order) values ('dragora_2_0', 'Dragora 2.0 Ardi', 9); -insert into distros (clean_name, full_name, id_order) values ('dragora_2_2', 'Dragora 2.2 Rafaela', 10); -insert into distros (clean_name, full_name, id_order) values ('dynebolic_2_5_2', 'Dyne:bolic 2.5.2 DHORUBA', 11); -insert into distros (clean_name, full_name, id_order) values ('dynebolic_3_0_X', 'Dyne:III 3.0.X MUNIR', 12); -insert into distros (clean_name, full_name, id_order) values ('gnewsense_2_3', 'gNewSense 2.3 Deltah', 13); -insert into distros (clean_name, full_name, id_order) values ('gnewsense_3_0', 'gNewSense 3.0 Metad (beta)', 14); -insert into distros (clean_name, full_name, id_order) values ('gnewsense_3_0_parkes', 'gNewSense 3.0 Parkes', 15); -insert into distros (clean_name, full_name, id_order) values ('gnewsense_4_0', 'gNewSense 4.0 Ucclia', 16); -insert into distros (clean_name, full_name, id_order) values ('guix_0_10', 'GuixSD 0.10', 17); -insert into distros (clean_name, full_name, id_order) values ('musix_2_0', 'Musix GNU+Linux 2.0 R0', 18); -insert into distros (clean_name, full_name, id_order) values ('musix_3_0_1', 'Musix GNU+Linux 3.0.1', 19); -insert into distros (clean_name, full_name, id_order) values ('parabola', 'Parabola GNU/Linux', 20); -insert into distros (clean_name, full_name, id_order) values ('trisquel_3_5', 'Trisquel 3.5 Awen', 21); -insert into distros (clean_name, full_name, id_order) values ('trisquel_4_0', 'Trisquel 4.0 Taranis', 22); -insert into distros (clean_name, full_name, id_order) values ('trisquel_4_5', 'Trisquel 4.5 Slaine', 23); -insert into distros (clean_name, full_name, id_order) values ('trisquel_5_0', 'Trisquel 5.0 Dagda', 24); -insert into distros (clean_name, full_name, id_order) values ('trisquel_5_5', 'Trisquel 5.5 Brigantia', 25); -insert into distros (clean_name, full_name, id_order) values ('trisquel_6_0', 'Trisquel 6.0 Toutatis', 26); -insert into distros (clean_name, full_name, id_order) values ('trisquel_7_0', 'Trisquel 7.0 Belenos', 27); -insert into distros (clean_name, full_name, id_order) values ('ututo_xs_2009', 'UTUTO XS 2009', 28); -insert into distros (clean_name, full_name, id_order) values ('ututo_xs_2010', 'UTUTO XS 2010', 29); -insert into distros (clean_name, full_name, id_order) values ('ututo_xs_2012_04', 'UTUTO XS 2012.04', 30); -insert into distros (clean_name, full_name, id_order) values ('venenux_0_8', 'VENENUX 0.8', 31); -insert into distros (clean_name, full_name, id_order) values ('venenux_0_8_2', 'VENENUX-EC 0.8.2', 32); -insert into distros (clean_name, full_name, id_order) values ('venenux_0_9', 'VENENUX 0.9', 33); +insert into distros (clean_name, full_name, id_order) values ('blag_90001', 'BLAG 90001', 1, 0); +insert into distros (clean_name, full_name, id_order) values ('blag_120000', 'BLAG 120000', 2, 0); +insert into distros (clean_name, full_name, id_order) values ('blag_140000', 'BLAG 1400000', 3, 1); +insert into distros (clean_name, full_name, id_order) values ('debian', 'Debian GNU/Linux Testing/Unstable', 4, 1); +insert into distros (clean_name, full_name, id_order) values ('debian_6', 'Debian GNU/Linux 6 squeeze', 5, 1); +insert into distros (clean_name, full_name, id_order) values ('debian_7', 'Debian GNU/Linux 7 wheezy', 6, 1); +insert into distros (clean_name, full_name, id_order) values ('debian_8', 'Debian GNU/Linux 8 jessie', 7, 1); +insert into distros (clean_name, full_name, id_order) values ('dragora_1_1', 'Dragora 1.1', 8, 0); +insert into distros (clean_name, full_name, id_order) values ('dragora_2_0', 'Dragora 2.0 Ardi', 9, 0); +insert into distros (clean_name, full_name, id_order) values ('dragora_2_2', 'Dragora 2.2 Rafaela', 10, 0); +insert into distros (clean_name, full_name, id_order) values ('dynebolic_2_5_2', 'Dyne:bolic 2.5.2 DHORUBA', 11, 0); +insert into distros (clean_name, full_name, id_order) values ('dynebolic_3_0_X', 'Dyne:III 3.0.X MUNIR', 12, 0); +insert into distros (clean_name, full_name, id_order) values ('gnewsense_2_3', 'gNewSense 2.3 Deltah', 13, 0); +insert into distros (clean_name, full_name, id_order) values ('gnewsense_3_0', 'gNewSense 3.0 Metad (beta)', 14, 0); +insert into distros (clean_name, full_name, id_order) values ('gnewsense_3_0_parkes', 'gNewSense 3.0 Parkes', 15), 0; +insert into distros (clean_name, full_name, id_order) values ('gnewsense_4_0', 'gNewSense 4.0 Ucclia', 16, 1); +insert into distros (clean_name, full_name, id_order) values ('guix_0_10', 'GuixSD 0.10', 17, 1); +insert into distros (clean_name, full_name, id_order) values ('musix_2_0', 'Musix GNU+Linux 2.0 R0', 18, 0); +insert into distros (clean_name, full_name, id_order) values ('musix_3_0_1', 'Musix GNU+Linux 3.0.1', 19, 0); +insert into distros (clean_name, full_name, id_order) values ('parabola', 'Parabola GNU/Linux', 20, 1); +insert into distros (clean_name, full_name, id_order) values ('trisquel_3_5', 'Trisquel 3.5 Awen', 21, 0); +insert into distros (clean_name, full_name, id_order) values ('trisquel_4_0', 'Trisquel 4.0 Taranis', 22, 0); +insert into distros (clean_name, full_name, id_order) values ('trisquel_4_5', 'Trisquel 4.5 Slaine', 23, 0); +insert into distros (clean_name, full_name, id_order) values ('trisquel_5_0', 'Trisquel 5.0 Dagda', 24, 0); +insert into distros (clean_name, full_name, id_order) values ('trisquel_5_5', 'Trisquel 5.5 Brigantia', 25, 0); +insert into distros (clean_name, full_name, id_order) values ('trisquel_6_0', 'Trisquel 6.0 Toutatis', 26, 1); +insert into distros (clean_name, full_name, id_order) values ('trisquel_7_0', 'Trisquel 7.0 Belenos', 27, 1); +insert into distros (clean_name, full_name, id_order) values ('ututo_xs_2009', 'UTUTO XS 2009', 28, 0); +insert into distros (clean_name, full_name, id_order) values ('ututo_xs_2010', 'UTUTO XS 2010', 29, 0); +insert into distros (clean_name, full_name, id_order) values ('ututo_xs_2012_04', 'UTUTO XS 2012.04', 30, 0); +insert into distros (clean_name, full_name, id_order) values ('venenux_0_8', 'VENENUX 0.8', 31, 0); +insert into distros (clean_name, full_name, id_order) values ('venenux_0_8_2', 'VENENUX-EC 0.8.2', 32, 0); +insert into distros (clean_name, full_name, id_order) values ('venenux_0_9', 'VENENUX 0.9', 33, 0); insert into reggroups (name) values ('manager'); insert into reggroups (name) values ('admin'); -- cgit v1.2.3