Fix the ability to modify the is_cycled property of a sequence. Per bug# 1515705...

diff --git a/classes/database/Postgres74.php b/classes/database/Postgres74.php
index 8024fcdc2c971dc3090b1ee4e7a01c9d2ecf96ee..a3da26ab296f491ac9ad01b1c2ef787cfac5994b 100644 (file)
--- a/classes/database/Postgres74.php
+++ b/classes/database/Postgres74.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: Postgres74.php,v 1.51 2006/05/19 07:17:30 chriskl Exp $
+ * $Id: Postgres74.php,v 1.52 2006/07/03 01:20:28 xzilla Exp $
  */
 
 include_once('./classes/database/Postgres73.php');
@@ -580,7 +580,8 @@ class Postgres74 extends Postgres73 {
                if ($maxvalue != '' && $maxvalue != $data->f['max_value']) $sql .= " MAXVALUE {$maxvalue}";
                if ($startvalue != '' && $startvalue != $data->f['last_value']) $sql .= " START {$startvalue}";
                if ($cachevalue != '' && $cachevalue != $data->f['cache_value']) $sql .= " CACHE {$cachevalue}";
-               if ($cycledvalue && $cycledvalue != $data->f['is_cycled']) $sql .= " CYCLE";
+               // toggle cycle yes/no
+               $sql .= (!$cycledvalue ? ' NO ' : '') . " CYCLE";       
                
                return $this->execute($sql);
        }       

diff --git a/sequences.php b/sequences.php
index 0caf284fe2ac2dd4b237daffbf9f7f445c086d88..4785d5570b0209b643903e6ec9db57dceda099dd 100644 (file)
--- a/sequences.php
+++ b/sequences.php
@@ -3,7 +3,7 @@
        /**
         * Manage sequences in a database
         *
-        * $Id: sequences.php,v 1.33 2006/06/17 12:57:36 xzilla Exp $
+        * $Id: sequences.php,v 1.34 2006/07/03 01:20:28 xzilla Exp $
         */
        
        // Include application functions
@@ -234,8 +234,8 @@
                        htmlspecialchars($_POST['formCacheValue']), "\" /></td></tr>\n";
                
                echo "<tr><th class=\"data left\"><label for=\"formCycledValue\">{$lang['striscycled']}</label></th>\n";
-               echo "<td class=\"data1\"><input type=\"checkbox\" id=\"formCycledValue\" name=\"formCycledValue\" value=\"",
-                       (isset($_POST['formCycledValue']) ? ' checked="checked"' : ''), "\" /></td></tr>\n";
+               echo "<td class=\"data1\"><input type=\"checkbox\" id=\"formCycledValue\" name=\"formCycledValue\" ",
+                       (isset($_POST['formCycledValue']) ? ' checked="checked"' : ''), " /></td></tr>\n";
 
                echo "</table>\n";
                echo "<p><input type=\"hidden\" name=\"action\" value=\"save_create_sequence\" />\n";
@@ -347,7 +347,7 @@
        function doSaveAlter() {
                global $data, $lang, $_reload_browser;
 
-               $status = $data->alterSequence($_POST['sequence'], $_POST['formIncrement'], $_POST['formMinValue'], $_POST['formMaxValue'], $_POST['formStartValue'], $_POST['formCacheValue'], $_POST['formCycledValue']);
+               $status = $data->alterSequence($_POST['sequence'], $_POST['formIncrement'], $_POST['formMinValue'], $_POST['formMaxValue'], $_POST['formStartValue'], $_POST['formCacheValue'], isset($_POST['formCycledValue']));
                if ($status == 0) {
                        doProperties($lang['strsequencealtered']);
                }
@@ -370,6 +370,10 @@
                $sequence = $data->getSequence($_REQUEST['sequence']);
                
                if (is_object($sequence) && $sequence->recordCount() > 0) {
+                       // Handle Checkbox Value
+                       $sequence->f['is_cycled'] = $data->phpBool($sequence->f['is_cycled']);
+                       if ($sequence->f['is_cycled']) $_POST['formCycledValue'] = 'on';
+
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo "<table>\n";
                        
@@ -394,8 +398,8 @@
                                htmlspecialchars($sequence->f['cache_value']), "\" /></td></tr>\n";
                        
                        echo "<tr><th class=\"data left\"><label for=\"formCycledValue\">{$lang['striscycled']}</label></th>\n";
-                       echo "<td class=\"data1\"><input type=\"checkbox\" id=\"formCycledValue\" name=\"formCycledValue\" value=\"",
-                               ($sequence->f['is_cycled'] ? ' checked="checked"' : ''), "\" /></td></tr>\n";
+                       echo "<td class=\"data1\"><input type=\"checkbox\" id=\"formCycledValue\" name=\"formCycledValue\" ",
+                               ( isset($_POST['formCycledValue']) ? ' checked="checked"' : ''), " /></td></tr>\n";
        
                        echo "</table>\n";
                        echo "<p><input type=\"hidden\" name=\"action\" value=\"alter\" />\n";