From d7e299015222ba20ed6df7c572fb8bca7e252010 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 22 Apr 2011 15:02:30 -0700
Subject: Insure that the number of items for a page is greater than zero. 
 Fixes ticket 1644.

---
 modules/gallery/controllers/admin_theme_options.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'modules/gallery/controllers')

diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index cb46da90..a968a56d 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -78,8 +78,10 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
     $group = $form->group("edit_theme")->label(t("Theme layout"));
     $group->input("page_size")->label(t("Items per page"))->id("g-page-size")
       ->rules("required|valid_digit")
+      ->callback(array($this, "_valididate_page_size"))
       ->error_messages("required", t("You must enter a number"))
       ->error_messages("valid_digit", t("You must enter a number"))
+      ->error_messages("valid_min_value", t("The value must be greater than zero"))
       ->value(module::get_var("gallery", "page_size"));
     $group->input("thumb_size")->label(t("Thumbnail size (in pixels)"))->id("g-thumb-size")
       ->rules("required|valid_digit")
@@ -110,5 +112,12 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
     $group->submit("")->value(t("Save"));
     return $form;
   }
+
+  function _valididate_page_size($input) {
+    if ($input->value < 1) {
+      $input->add_error("valid_min_value", true);
+    }
+
+  }
 }
 
-- 
cgit v1.2.3


From c1df782a75193d4ee33ec1d0be10739f9320705f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 23 Apr 2011 13:04:23 -0700
Subject: Use an absolute url for the upgrader link.  Also, clear the
 upgrade_now site status message every time we go to Admin > Modules. Fixes
 #1695.

---
 modules/gallery/controllers/admin_modules.php | 6 +++---
 modules/gallery/helpers/module.php            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/gallery/controllers')

diff --git a/modules/gallery/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
index 787785ea..b712d14f 100644
--- a/modules/gallery/controllers/admin_modules.php
+++ b/modules/gallery/controllers/admin_modules.php
@@ -19,6 +19,9 @@
  */
 class Admin_Modules_Controller extends Admin_Controller {
   public function index() {
+    // If modules need upgrading, this will get recreated in module::available()
+    site_status::clear("upgrade_now");
+
     $view = new Admin_View("admin.html");
     $view->page_title = t("Modules");
     $view->content = new View("admin_modules.html");
@@ -103,9 +106,6 @@ class Admin_Modules_Controller extends Admin_Controller {
 
     module::event("module_change", $changes);
 
-    // If modules need upgrading, this will get recreated
-    site_status::clear("upgrade_now");
-
     // @todo this type of collation is questionable from an i18n perspective
     if ($activated_names) {
       message::success(t("Activated: %names", array("names" => join(", ", $activated_names))));
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 37f7f68a..4b7d4a5f 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -101,7 +101,7 @@ class module_Core {
         $m->locked = false;
 
         if ($m->active && $m->version != $m->code_version) {
-          site_status::warning(t("Some of your modules are out of date.  <a href=\"%upgrader_url\">Upgrade now!</a>", array("upgrader_url" => url::site("upgrader"))), "upgrade_now");
+          site_status::warning(t("Some of your modules are out of date.  <a href=\"%upgrader_url\">Upgrade now!</a>", array("upgrader_url" => url::abs_site("upgrader"))), "upgrade_now");
         }
       }
 
-- 
cgit v1.2.3