stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-23 01:39:53 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a "weight" column to the module table. This allows us to specify

Browse Source 
module ordering, which is currently being done in the moduleorder
contrib module.

By default, the weight will be the same as the id of the row which
means that new modules will get added at the end of the list.  This is
covered in the upgrade case as well.

The one gotcha is that we need to make sure that we don't try to sort
by the weight column if the gallery module version is < 32, which is
something we haven't done before.
This commit is contained in:
Bharat Mediratta
2010-08-06 10:41:38 -07:00
parent 0fe44fe380
commit d3a161ca1b
4 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/gallery/helpers/module.php
View File

@@ -166,6 +166,16 @@ class module_Core {
} else {
module::set_version($module_name, 1);
}
// Set the weight of the new module, which controls the order in which the modules are
// loaded. By default, new modules are installed at the end of the priority list. Since the
// id field is monotonically increasing, the easiest way to guarantee that is to set the weight
// the same as the id. We don't know that until we save it for the first time
$module = ORM::factory("module")->where("name", "=", $module_name)->find();
if ($module->loaded()) {
$module->weight = $module->id;
$module->save();
}
module::load_modules();
// Now the module is installed but inactive, so don't leave it in the active path
@@ -314,7 +324,15 @@ class module_Core {
self::$modules = array();
self::$active = array();
$kohana_modules = array();
foreach (ORM::factory("module")->find_all() as $module) {
// In version 32 we introduced a weight column so we can specify the module order
// If we try to use that blindly, we'll break earlier versions before they can even
// run the upgrader.
$modules = module::get_version("gallery") < 32 ?
ORM::factory("module")->find_all():
ORM::factory("module")->order_by("weight")->find_all();
foreach ($modules as $module) {
self::$modules[$module->name] = $module;
if (!$module->active) {
continue;