X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eventum-order.patch;h=5764514ba18bbecb6b4ef71b611d190aebb24fb3;hb=371b276ab631c8d0f88f9387e6f31dffa7ad386a;hp=072112d3d04c432c21d864e2c57c221b232d83e5;hpb=1f9de427095c9e57aacceb75de8988dc317e6df2;p=packages%2Feventum.git

diff --git a/eventum-order.patch b/eventum-order.patch
index 072112d..5764514 100644
--- a/eventum-order.patch
+++ b/eventum-order.patch
@@ -70,13 +70,12 @@
 +        }
 +    }
 +}
---- eventum-2.2/htdocs/css/style.css~	2009-10-12 22:27:13.000000000 +0300
-+++ eventum-2.2/htdocs/css/style.css	2009-10-12 22:28:31.402712101 +0300
-@@ -176,3 +176,22 @@
- .custom_field {
+--- eventum-2.3.1/htdocs/css/style.css~	2011-09-15 09:36:55.000000000 +0300
++++ eventum-2.3.1/htdocs/css/style.css	2011-09-15 09:38:23.668223576 +0300
+@@ -177,6 +177,24 @@
      cursor: pointer;
  }
-+
+ 
 +.tDnD_whileDrag td {
 +    background-color: #ffffdd;
 +}
@@ -94,6 +93,16 @@
 +	background-image: url(../images/updown2.gif);
 +    background-repeat: no-repeat;
 +    background-position: center center;
++}
+ 
+ ul.excerpts {
+     list-style: none;
+@@ -187,4 +205,4 @@
+ ul.excerpts ul {
+     list-style-type: none;
+     padding-left: 1em;
+-}
+\ No newline at end of file
 +}
 --- eventum-2.2/htdocs/js/jquery/jquery.tablednd.js	1970-01-01 02:00:00.000000000 +0200
 +++ eventum-2.2-order/htdocs/js/jquery/jquery.tablednd.js	2009-10-12 22:10:36.435851675 +0300
@@ -481,10 +490,10 @@
 +	}
 +);
 \ 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.2/htdocs/list.php~	2012-03-09 18:19:56.000000000 +0200
++++ eventum-2.3.2/htdocs/list.php	2012-03-09 18:32:43.998284397 +0200
+@@ -67,6 +67,11 @@
+     }
  }
  
 +@$reorder_usr_id = $_REQUEST["reorder_user"];
@@ -492,10 +501,10 @@
 +@$reorder_neworder = $_REQUEST["reorder_neworder"];
 +Issue::reorderUserIssues($reorder_usr_id, $reorder_issue_id, $reorder_neworder);
 +
- $options = Issue::saveSearchParams();
- $tpl->assign("options", $options);
- $tpl->assign("sorting", Issue::getSortingInfo($options));
-@@ -78,6 +83,24 @@
+ if (!empty($_REQUEST['nosave'])) {
+ 	$options = Search::saveSearchParams(false);
+ } else {
+@@ -92,6 +97,24 @@
  }
  $assign_options += $users;
  
@@ -517,7 +526,7 @@
 +    $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
@@ -534,23 +543,23 @@
              )
          );
          return $columns[$page];
---- eventum-2.2/lib/eventum/class.issue.php	2009-09-14 18:07:55.000000000 +0300
-+++ eventum-2.2-order/lib/eventum/class.issue.php	2009-10-12 22:10:36.445851670 +0300
-@@ -1333,6 +1333,7 @@
-             Error_Handler::logError(array($res->getMessage(), $res->getDebugInfo()), __FILE__, __LINE__);
+--- eventum-2.3.1/lib/eventum/class.issue.php~	2011-09-15 09:36:55.000000000 +0300
++++ eventum-2.3.1/lib/eventum/class.issue.php	2011-09-15 09:42:02.844032474 +0300
+@@ -1374,6 +1374,7 @@
              return -1;
-         } else {
-+            self::moveOrderForAllUsers($issue_id, 1000);
-             $prj_id = self::getProjectID($issue_id);
+         }
  
-             // record the change
++        self::moveOrderForAllUsers($issue_id, 1000);
+         $prj_id = self::getProjectID($issue_id);
+ 
+         // record the change
 @@ -1800,16 +1801,33 @@
      {
          $issue_id = Misc::escapeInteger($issue_id);
          $assignee_usr_id = Misc::escapeInteger($assignee_usr_id);
 +        $order = 1;
 +        // move all orders down to free "order space" for this new association
-+        $stmt = "UPDATE 
++        $stmt = "UPDATE
 +                    " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue_user
 +                 SET
 +                    isu_order = isu_order + 1
@@ -675,34 +684,14 @@
          $stmt = "DELETE FROM
                      " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue_user
                   WHERE
-@@ -1883,6 +1975,7 @@
-                 History::add($issue_id, Auth::getUserID(), History::getTypeID('user_unassociated'),
-                     User::getFullName($usr_id) . ' removed from issue by ' . User::getFullName(Auth::getUserID()));
-             }
-+            self::rearrangeDeleteUserAssociationOrderList($delete_order_list);
-             return 1;
+@@ -2020,6 +2021,7 @@
+             History::add($issue_id, Auth::getUserID(), History::getTypeID('user_unassociated'),
+                 User::getFullName($usr_id) . ' removed from issue by ' . User::getFullName(Auth::getUserID()));
          }
++        self::rearrangeDeleteUserAssociationOrderList($delete_order_list);
+         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
@@ -868,16 +857,39 @@
 +    }
 +    
  }
---- eventum-2.2/templates/header.tpl.html~	2009-11-05 17:04:54.000000000 +0200
-+++ eventum-2.2/templates/header.tpl.html	2009-11-05 17:05:17.976837914 +0200
+--- 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.1/templates/header.tpl.html~	2011-09-15 09:36:55.000000000 +0300
++++ eventum-2.3.1/templates/header.tpl.html	2011-09-15 09:43:49.318473817 +0300
 @@ -18,6 +18,7 @@
  <script type="text/javascript" src="{$rel_url}js/jquery/form.js?c=9984"></script>
  <script type="text/javascript" src="{$rel_url}js/jquery/blockui.js?c=eb13"></script>
  <script type="text/javascript" src="{$rel_url}js/jquery/ui.datepicker.js?c=a911"></script>
 +<script type="text/javascript" src="{$rel_url}js/jquery/jquery.tablednd.js"></script>
- <script type="text/javascript" src="{$rel_url}js/validation.js?c=901a"></script>
+ <script type="text/javascript" src="{$rel_url}js/validation.js?c=ad33"></script>
  <script type="text/javascript" src="{$rel_url}js/browserSniffer.js?c=c046"></script>
- <script type="text/javascript" src="{$rel_url}js/global.js?c=42a4"></script>
+ <script type="text/javascript" src="{$rel_url}js/global.js?c=50d6"></script>
 --- eventum-2.2/templates/list.tpl.html	2009-09-14 18:07:55.000000000 +0300
 +++ eventum-2.2-order/templates/list.tpl.html	2009-10-12 22:10:36.439185157 +0300
 @@ -92,6 +92,28 @@