r1339: Changing the javscript version of the column options system to use simple...

diff --git a/docs/arrow_solid.psd b/docs/arrow_solid.psd
deleted file mode 100644 (file)
index 52a8d55..0000000
Binary files a/docs/arrow_solid.psd and /dev/null differ

diff --git a/includes/api_user.php b/includes/api_user.php
index 4de61e765f34b3d6db155a5d86f691b66b5a3ce5..69061d159c6cf2cbfa23c8796e3628b2dcb45906 100644 (file)
--- a/includes/api_user.php
+++ b/includes/api_user.php
@@ -324,7 +324,7 @@ class UserAPI extends API
        */
        function verify_columnoptions()
        {
-               if (is_array($this->values['columnoptiopns']))
+               if (is_array($this->values['columnoptions']))
                {
                        $this->set('columnoptions', serialize($this->values['columnoptions']));
                }

diff --git a/templates/images/arrow_down.gif b/templates/images/arrow_down.gif
deleted file mode 100644 (file)
index 1e4aef5..0000000
Binary files a/templates/images/arrow_down.gif and /dev/null differ

diff --git a/templates/images/arrow_up.gif b/templates/images/arrow_up.gif
deleted file mode 100644 (file)
index 314c449..0000000
Binary files a/templates/images/arrow_up.gif and /dev/null differ

diff --git a/templates/userctrl.tpl b/templates/userctrl.tpl
index af2a827a1b3c7fec104df7dafe35d452c4cc96e6..f1d9eb9b3c67ecf566e5bcff22b912a591649e0a 100644 (file)
--- a/templates/userctrl.tpl
+++ b/templates/userctrl.tpl
@@ -235,8 +235,8 @@ $header
                                        
                                        <fieldset>
                                                <legend>{@"Bug List Columns"}</legend>
-                                               <table cellspacing="2" cellpadding="1" border="0" id="bugColumns">
-                                                       $columnOptions
+                                               <table cellspacing="2" cellpadding="1" border="0">
+                                               $columnOptions
                                                </table>
                                        </fieldset>
                                </div>

diff --git a/userctrl.php b/userctrl.php
index 1e6c181362a6180aeb2fb6eb4f0fc344c8de7e00..4592b02fe197688b9b84fe83f8a91a1a10f7cddd 100644 (file)
--- a/userctrl.php
+++ b/userctrl.php
@@ -118,7 +118,8 @@ if ($_POST['do'] == 'update')
        $userapi->set('hidestatuses',   $bugsys->in['hidestatuses']);
        $userapi->set('defaultsortkey', $bugsys->in['defaultsortkey']);
        $userapi->set('defaultsortas',  $bugsys->in['defaultsortas']);
-       
+       $userapi->set('columnoptions',  $bugsys->input_clean('columnoptions', TYPE_UINT));
+               
        // -------------------------------------------------------------------
        // copy fields
        $userinfo['displayname'] = $bugsys->in['displayname'];
@@ -130,6 +131,7 @@ if ($_POST['do'] == 'update')
        $userinfo['hidestatuses'] = $bugsys->in['hidestatuses'];
        $userinfo['defaultsorkey'] = $bugsys->in['defaultsorkey'];
        $userinfo['defaultsortas'] = $bugsys->in['defaultsortas'];
+       $userinfo['columnoptions'] = $bugsys->in['columnoptions'];
        
        $email = $bugsys->in['email_change'];
        $email_confirm = $bugsys->in['email_confirm'];
@@ -226,23 +228,32 @@ if ($_REQUEST['do'] == 'modify')
                }
        }
        
-       $position = 0;
-       $columns = '{ ';
-       $array = ((is_array($bugsys->userinfo['columnoptions']) AND sizeof($bugsys->userinfo['columnoptions']) == sizeof($bugsys->columns)) ? $bugsys->userinfo['columnoptions'] : $bugsys->columns);
-       foreach ($array AS $column => $mask)
+       $columns = array();
+       $columnOptions = '';
+       if (!is_array($bugsys->in['columnoptions']))
        {
-               $columnName = $bugsys->columnNames["$column"];
-               eval('$columnOptions .= "' . $template->fetch('userctrl_column') . '";');
-               $columns = '';
-               $position++;
+               foreach ($bugsys->columns AS $column => $mask)
+               {
+                       if (is_array($bugsys->userinfo['columnoptions']))
+                       {
+                               $columns["$column"] = $bugsys->userinfo['columnoptions']["$column"];
+                       }
+                       else
+                       {
+                               $columns["$column"] = $bugsys->options['columnoptions']["$colunn"];
+                       }
+                       eval('$columnOptions .= "' . $template->fetch('userctrl_column') . '";');
+               }
        }
-       
-       $columns = array();
-       if (!is_array($bugsys->in['columns']))
+       else
        {
-               $columns = '{"' . implode('": "', $bugsys->userinfo['columnoptions']) .  '"}';
+               $columns = $bugsys->in['columnoptions'];
+               foreach ($bugsys->columns AS $column => $mask)
+               {
+                       eval('$columnOptions .= "' . $template->fetch('userctrl_column') . '";');
+               }
        }
-       
+               
        eval('$template->flush("' . $template->fetch('userctrl') . '");');
 }