[Rt-commit] rt branch, 3.8.8-releng, updated. rt-3.8.7-345-g3efeed2

[Ruslan Zakirov]

The branch, 3.8.8-releng has been updated
       via  3efeed20de95312edca7007f53d6133d04d18411 (commit)
       via  85a041454164c4c16821cbd19b5651a8313becb6 (commit)
       via  18ebba89c2db2acfbde7fe1b324c9b8cb476fac6 (commit)
       via  fae532008ae33c2631ae03de32cc4eeb59afef83 (commit)
       via  67d6a37b44d0d6bd24fedbd5f1298a5c60ee23f4 (commit)
       via  06aa393cb686d21edbc48f146be53394c6ea113d (commit)
       via  a2c8f469f182140bf25c4869f10442d68f5cbf1d (commit)
       via  ac867d76715986ff780c0800bfd66cd951b03625 (commit)
      from  74428a7e5ee979a53996cf19b5f062b6281b3f7a (commit)

Summary of changes:
 UPGRADING                                     |    4 +-
 lib/RT/User_Overlay.pm                        |   65 +++++++++++++++++++++++++
 share/html/Admin/Users/Modify.html            |   63 ++++++------------------
 share/html/Dashboards/Elements/HiddenSearches |    3 +
 share/html/Elements/CollectionList            |    4 +-
 share/html/Elements/EditPassword              |   34 +++++++++++++
 share/html/SelfService/Prefs.html             |   65 +++++++------------------
 share/html/User/Prefs.html                    |   56 +++++----------------
 8 files changed, 155 insertions(+), 139 deletions(-)
 create mode 100644 share/html/Elements/EditPassword

- Log -----------------------------------------------------------------
commit 85a041454164c4c16821cbd19b5651a8313becb6
Merge: 18ebba8 fae5320
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue Apr 13 01:57:59 2010 +0400

    Merge branch 'safe_set_password' into 3.8-trunk


commit 3efeed20de95312edca7007f53d6133d04d18411
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue Apr 13 02:35:13 2010 +0400

    apply order when sorting is not allowed, but arg is there
    
    If sorting is allowed then we use arguments or no sorting
    if arguments are empty.
    
    If sorting is not allowed then we only apply order arguments
    when collection has no predefined order

diff --git a/share/html/Elements/CollectionList b/share/html/Elements/CollectionList
index 14d5d92..c7bdfd9 100644
--- a/share/html/Elements/CollectionList
+++ b/share/html/Elements/CollectionList
@@ -54,7 +54,9 @@ if (!$Collection && $Class eq 'RT::Tickets') {
 my $TotalFound = $Collection->CountAll();
 return '' if !$TotalFound && !$ShowEmpty;
 
-if ( @OrderBy && $AllowSorting ) {
+# XXX: ->{'order_by'} is hacky, but there is no way to check if
+# collection is ordered or not
+if ( @OrderBy && ($AllowSorting || !$Collection->{'order_by'}) ) {
     if ( $OrderBy[0] =~ /\|/ ) {
         @OrderBy = split /\|/, $OrderBy[0];
         @Order = split /\|/,$Order[0];

-----------------------------------------------------------------------