- updated (2011-04-20)

Changed files:
    eventum-order.patch -> 1.30

diff --git a/eventum-order.patch b/eventum-order.patch
index cfd70f370eeca2a7803bd6de1e46b88e7da8689b..6e243a8fc4523f79d47f712cb5a30c1f772f4e66 100644 (file)
--- a/eventum-order.patch
+++ b/eventum-order.patch
@@ -481,10 +481,10 @@
 +      }
 +);
 \ No newline at end of file
 +      }
 +);
 \ No newline at end of file

---- eventum-2.2/htdocs/list.php        2009-09-14 18:07:55.000000000 +0300
-+++ eventum-2.2-order/htdocs/list.php  2009-10-12 22:10:36.435851675 +0300
-@@ -53,6 +53,11 @@
-             $profile['sort_by'] . "&sort_order=" . $profile['sort_order']);
+--- eventum-2.3.1/htdocs/list.php~     2011-04-20 17:37:25.000000000 +0300
++++ eventum-2.3.1/htdocs/list.php      2011-04-20 17:40:51.675898467 +0300
+@@ -67,6 +67,11 @@
+     }

  }
  
 +@$reorder_usr_id = $_REQUEST["reorder_user"];
  }
  
 +@$reorder_usr_id = $_REQUEST["reorder_user"];


@@ -492,10 +492,10 @@
 +@$reorder_neworder = $_REQUEST["reorder_neworder"];
 +Issue::reorderUserIssues($reorder_usr_id, $reorder_issue_id, $reorder_neworder);
 +
 +@$reorder_neworder = $_REQUEST["reorder_neworder"];
 +Issue::reorderUserIssues($reorder_usr_id, $reorder_issue_id, $reorder_neworder);
 +

- $options = Issue::saveSearchParams();
+ $options = Search::saveSearchParams();

  $tpl->assign("options", $options);
  $tpl->assign("options", $options);

- $tpl->assign("sorting", Issue::getSortingInfo($options));
-@@ -78,6 +83,24 @@
+ $tpl->assign("sorting", Search::getSortingInfo($options));
+@@ -92,6 +97,24 @@

  }
  $assign_options += $users;
  
  }
  $assign_options += $users;
  


@@ -517,7 +517,7 @@
 +    $tpl->assign("isu_order_user", $isu_order_user);
 +}
 +
 +    $tpl->assign("isu_order_user", $isu_order_user);
 +}
 +

- $list = Issue::getListing($prj_id, $options, $pagerRow, $rows);
+ $list = Search::getListing($prj_id, $options, $pagerRow, $rows);

  $tpl->assign("list", $list["list"]);
  $tpl->assign("list_info", $list["info"]);
 --- eventum-2.2/lib/eventum/class.display_column.php   2009-09-14 18:07:55.000000000 +0300
  $tpl->assign("list", $list["list"]);
  $tpl->assign("list_info", $list["info"]);
 --- eventum-2.2/lib/eventum/class.display_column.php   2009-09-14 18:07:55.000000000 +0300


@@ -683,26 +683,6 @@
              return 1;
          }
      }
              return 1;
          }
      }

-@@ -2342,6 +2435,11 @@
-     {
-         $sort_by = self::getParam('sort_by');
-         $sort_order = self::getParam('sort_order');
-+        $users = self::getParam('users');
-+        if (empty($users) && ($sort_by == 'isu_order')) { // Sorting by isu_order is impossible when no user specified
-+            unset($sort_by);
-+            unset($sort_order);
-+        }
-         $rows = self::getParam('rows');
-         $hide_closed = self::getParam('hide_closed');
-         if ($hide_closed === '') {
-@@ -2448,6 +2546,7 @@
-             "iss_expected_resolution_date" => "desc",
-             "pre_title" => "asc",
-             "assigned" => "asc",
-+            "isu_order" => "desc",
-         );
- 
-         foreach ($custom_fields as $fld_id => $fld_name) {

 @@ -3253,6 +3352,8 @@
          $ids = implode(", ", $ids);
          $stmt = "SELECT
 @@ -3253,6 +3352,8 @@
          $ids = implode(", ", $ids);
          $stmt = "SELECT


@@ -868,6 +848,29 @@
 +    }
 +    
  }
 +    }
 +    
  }

+--- eventum-2.3.1/lib/eventum/class.search.php~        2011-04-20 17:22:15.000000000 +0300
++++ eventum-2.3.1/lib/eventum/class.search.php 2011-04-20 17:44:34.498519260 +0300
+@@ -63,6 +63,12 @@
+     {
+         $sort_by = self::getParam('sort_by');
+         $sort_order = self::getParam('sort_order');
++        $users = self::getParam('users');
++        if (empty($users) && $sort_by === 'isu_order') {
++            // Sorting by isu_order is impossible when no user specified
++            unset($sort_by);
++            unset($sort_order);
++        }
+         $rows = self::getParam('rows');
+         $hide_closed = self::getParam('hide_closed');
+         if ($hide_closed === '') {
+@@ -174,6 +174,7 @@
+             "iss_expected_resolution_date" => "desc",
+             "pre_title" => "asc",
+             "assigned" => "asc",
++            "isu_order" => "desc",
+         );
+ 
+         foreach ($custom_fields as $fld_id => $fld_name) {

 --- eventum-2.3/templates/header.tpl.html~     2010-09-27 18:12:42.000000000 +0300
 +++ eventum-2.3/templates/header.tpl.html      2010-09-27 18:13:08.884494665 +0300
 @@ -18,6 +18,7 @@
 --- eventum-2.3/templates/header.tpl.html~     2010-09-27 18:12:42.000000000 +0300
 +++ eventum-2.3/templates/header.tpl.html      2010-09-27 18:13:08.884494665 +0300
 @@ -18,6 +18,7 @@