[Rt-commit] r10776 - in rt/branches/3.999-DANGEROUS: . bin docs docs/design_docs etc html/Admin/Elements html/Admin/Groups html/Admin/Queues html/Admin/Users html/Elements html/Elements/CollectionAsTable html/Prefs html/Search html/Search/Elements html/SelfService/Elements html/Ticket/Elements lib/RT/Model share/po t/api t/ticket

jesse at bestpractical.com jesse at bestpractical.com
Fri Feb 8 18:10:41 EST 2008


Author: jesse
Date: Fri Feb  8 18:10:40 2008
New Revision: 10776

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/bin/rt
   rt/branches/3.999-DANGEROUS/docs/design_docs/realflow.txt
   rt/branches/3.999-DANGEROUS/docs/design_docs/ruleset-workflow.txt
   rt/branches/3.999-DANGEROUS/docs/extending_clickable_links.pod
   rt/branches/3.999-DANGEROUS/etc/config.yml
   rt/branches/3.999-DANGEROUS/etc/initialdata
   rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditTemplates
   rt/branches/3.999-DANGEROUS/html/Admin/Groups/Members.html
   rt/branches/3.999-DANGEROUS/html/Admin/Groups/index.html
   rt/branches/3.999-DANGEROUS/html/Admin/Queues/index.html
   rt/branches/3.999-DANGEROUS/html/Admin/Users/Memberships.html
   rt/branches/3.999-DANGEROUS/html/Admin/Users/index.html
   rt/branches/3.999-DANGEROUS/html/Elements/CollectionAsTable/Header
   rt/branches/3.999-DANGEROUS/html/Elements/CollectionList
   rt/branches/3.999-DANGEROUS/html/Elements/TicketList
   rt/branches/3.999-DANGEROUS/html/Prefs/Search.html
   rt/branches/3.999-DANGEROUS/html/Prefs/SearchOptions.html
   rt/branches/3.999-DANGEROUS/html/Search/Build.html
   rt/branches/3.999-DANGEROUS/html/Search/Bulk.html
   rt/branches/3.999-DANGEROUS/html/Search/Edit.html
   rt/branches/3.999-DANGEROUS/html/Search/Elements/DisplayOptions
   rt/branches/3.999-DANGEROUS/html/Search/Elements/EditSearches
   rt/branches/3.999-DANGEROUS/html/Search/Elements/ResultViews
   rt/branches/3.999-DANGEROUS/html/Search/Results.html
   rt/branches/3.999-DANGEROUS/html/Search/Results.tsv
   rt/branches/3.999-DANGEROUS/html/SelfService/Elements/MyRequests
   rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs
   rt/branches/3.999-DANGEROUS/html/Tools/MyDay.html
   rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupMember.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/LinkCollection.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/ObjectCustomFieldValue.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripCollection.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/TicketCollection.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm
   rt/branches/3.999-DANGEROUS/share/po/cs.po
   rt/branches/3.999-DANGEROUS/share/po/da.po
   rt/branches/3.999-DANGEROUS/share/po/de.po
   rt/branches/3.999-DANGEROUS/share/po/es.po
   rt/branches/3.999-DANGEROUS/share/po/fi.po
   rt/branches/3.999-DANGEROUS/share/po/fr.po
   rt/branches/3.999-DANGEROUS/share/po/he.po
   rt/branches/3.999-DANGEROUS/share/po/hu.po
   rt/branches/3.999-DANGEROUS/share/po/id.po
   rt/branches/3.999-DANGEROUS/share/po/it.po
   rt/branches/3.999-DANGEROUS/share/po/ja.po
   rt/branches/3.999-DANGEROUS/share/po/nl.po
   rt/branches/3.999-DANGEROUS/share/po/no.po
   rt/branches/3.999-DANGEROUS/share/po/pt_br.po
   rt/branches/3.999-DANGEROUS/share/po/ru.po
   rt/branches/3.999-DANGEROUS/share/po/sv.po
   rt/branches/3.999-DANGEROUS/share/po/tr.po
   rt/branches/3.999-DANGEROUS/share/po/zh_cn.po
   rt/branches/3.999-DANGEROUS/share/po/zh_tw.po
   rt/branches/3.999-DANGEROUS/t/api/attribute-tests.t
   rt/branches/3.999-DANGEROUS/t/api/scrip_order.t
   rt/branches/3.999-DANGEROUS/t/ticket/search_by_txn.t
   rt/branches/3.999-DANGEROUS/t/ticket/sort_by_cf.t

Log:
 r27531 at 31b:  jesse | 2008-02-08 18:08:57 -0500
 Order -> order
 more postgres fixes


Modified: rt/branches/3.999-DANGEROUS/bin/rt
==============================================================================
--- rt/branches/3.999-DANGEROUS/bin/rt	(original)
+++ rt/branches/3.999-DANGEROUS/bin/rt	Fri Feb  8 18:10:40 2008
@@ -1731,7 +1731,7 @@
 
         In addition,
         
-        -o +/-<field>   Orders the returned list by the specified field.
+        -o +/-<field>   orders the returned list by the specified field.
         -S var=val      Submits the specified variable with the request.
         -t type         Specifies the type of object to look for. (The
                         default is "ticket".)

Modified: rt/branches/3.999-DANGEROUS/docs/design_docs/realflow.txt
==============================================================================
--- rt/branches/3.999-DANGEROUS/docs/design_docs/realflow.txt	(original)
+++ rt/branches/3.999-DANGEROUS/docs/design_docs/realflow.txt	Fri Feb  8 18:10:40 2008
@@ -21,7 +21,7 @@
   without affecting existing ones.
 }
 
-- The user of OrderRequest queue needs to fill a numeric "CF",
+- The user of orderRequest queue needs to fill a numeric "CF",
   called "Price".
 - On creation, it needs to create following approvals:
     - "Manager" approval if CF.Price is > 1000
@@ -40,7 +40,7 @@
      # i.e. if no active tickets still have a lock on it
      -> ForceCreateTicketWithRuleset $ruleset
 
-[Queue OrderRequest]
+[Queue orderRequest]
   -> Condition: OnCreate
      Action: AddTicketRuleSet "PurchaseApproval"
              # Triggers immediately

Modified: rt/branches/3.999-DANGEROUS/docs/design_docs/ruleset-workflow.txt
==============================================================================
--- rt/branches/3.999-DANGEROUS/docs/design_docs/ruleset-workflow.txt	(original)
+++ rt/branches/3.999-DANGEROUS/docs/design_docs/ruleset-workflow.txt	Fri Feb  8 18:10:40 2008
@@ -5,7 +5,7 @@
 
 == Text description
 
-* The user of PurchaseOrder queue fill in a numeric "CF", called "Price".
+* The user of Purchaseorder queue fill in a numeric "CF", called "Price".
 * On creation, it needs to create following approvals:
 ** "ManagerApproval" if CF.Price is > 1000
 ** "PresidentApproval" if CF.Price is > 2000
@@ -56,7 +56,7 @@
 * Condition: OnCreate
 * Action: AquireMyLocks
 
-=== queue "PurchaseOrder"
+=== queue "Purchaseorder"
 
 * Rule:
 ** Condition: OnCreate

Modified: rt/branches/3.999-DANGEROUS/docs/extending_clickable_links.pod
==============================================================================
--- rt/branches/3.999-DANGEROUS/docs/extending_clickable_links.pod	(original)
+++ rt/branches/3.999-DANGEROUS/docs/extending_clickable_links.pod	Fri Feb  8 18:10:40 2008
@@ -29,9 +29,9 @@
 RTIR is shipped with several actions you can use: 'ip', 'ipdecimal',
 'email', 'domain' and 'RIPE'.
 
-=head2 Order of clicky actions
+=head2 order of clicky actions
 
-Order of actions is important in situations when you use actions that
+order of actions is important in situations when you use actions that
 could match the same block of a text, in this case only the first matching
 action from the list would be applied. For example ot makes no sense to
 use C<httpurl> and C<httpurl_overwrite> at the same time as both actions

Modified: rt/branches/3.999-DANGEROUS/etc/config.yml
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/config.yml	(original)
+++ rt/branches/3.999-DANGEROUS/etc/config.yml	Fri Feb  8 18:10:40 2008
@@ -8,11 +8,11 @@
   Database: 
     CheckSchema: 0
     Database: rt4
-    Driver: mysql
+    Driver: Pg
     Host: localhost
     password: ''
     RecordBaseClass: Jifty::DBI::Record::Cachable
-    User: root
+    User: postgres
     Version: 0.0.1
   DevelMode: 1
   L10N: 

Modified: rt/branches/3.999-DANGEROUS/etc/initialdata
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/initialdata	(original)
+++ rt/branches/3.999-DANGEROUS/etc/initialdata	Fri Feb  8 18:10:40 2008
@@ -688,7 +688,7 @@
                  . q{Priority, Queuename, ExtendedStatus},
         query   => " owner = '__CurrentUser__' AND ( Status = 'new' OR Status = 'open')",
         order_by => 'Priority',
-        Order   => 'DESC'
+        order   => 'DESC'
       },
     },
     { name => 'Search - Unowned Tickets',

Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditTemplates
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditTemplates	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditTemplates	Fri Feb  8 18:10:40 2008
@@ -11,13 +11,13 @@
 
 <& /Elements/CollectionList,
     order_by       => 'id',
-    Order         => 'ASC',
+    order         => 'ASC',
     %ARGS,
     display_format => '__CheckBox.{DeleteTemplates}__,'. $format,
     format        => $format,
     Collection    => $Templates,
     AllowSorting  => 1,
-    PassArguments => [qw(format Rows Page Order order_by FinddisabledQueues)],
+    PassArguments => [qw(format Rows Page order order_by FinddisabledQueues)],
 &>
 % }
 

Modified: rt/branches/3.999-DANGEROUS/html/Admin/Groups/Members.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Groups/Members.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Groups/Members.html	Fri Feb  8 18:10:40 2008
@@ -77,7 +77,7 @@
 <br />
 <&|/l&>Users</&>
 % my $Users = $Group->user_members_obj;
-% $Users->order_by( column => $Userorder_by, order => $UserOrder );
+% $Users->order_by( column => $Userorder_by, order => $Userorder );
 <ul>
 % while ( my $user = $Users->next ) {
 % $UsersSeen{ $user->id } = 1 if $SkipSeenUsers;
@@ -152,7 +152,7 @@
 @add_members_groups => ()
 $id => undef
 $Userorder_by => 'name'
-$UserOrder => 'ASC'
+$Userorder => 'ASC'
 $SkipSeenUsers => 1
 $SkipSeenGroups => 1
 </%ARGS>

Modified: rt/branches/3.999-DANGEROUS/html/Admin/Groups/index.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Groups/index.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Groups/index.html	Fri Feb  8 18:10:40 2008
@@ -57,13 +57,13 @@
 
 <& /Elements/CollectionList,
     order_by => 'name',
-    Order => 'ASC',
+    order => 'ASC',
     Rows  => 100,
     %ARGS,
     format => $format,
     Collection => $Groups,
     AllowSorting => 1,
-    PassArguments => [qw(format Rows Page Order order_by GroupString GroupOp Groupfield FinddisabledGroups)],
+    PassArguments => [qw(format Rows Page order order_by GroupString GroupOp Groupfield FinddisabledGroups)],
 &>
 
 % my $ids = join ',', map $_->id, @{ $Groups->items_array_ref };

Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/index.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/index.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/index.html	Fri Feb  8 18:10:40 2008
@@ -59,12 +59,12 @@
 % } else {
 <& /Elements/CollectionList,
     order_by => 'name',
-    Order => 'ASC',
+    order => 'ASC',
     %ARGS,
     format => $format,
     Collection => $queues,
     AllowSorting => 1,
-    PassArguments => [qw(format Rows Page Order order_by FinddisabledQueues)],
+    PassArguments => [qw(format Rows Page order order_by FinddisabledQueues)],
 &>
 % }
 <form method="post" action="<% RT->config->get('WebPath') %>/Admin/Queues/index.html">

Modified: rt/branches/3.999-DANGEROUS/html/Admin/Users/Memberships.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Users/Memberships.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Users/Memberships.html	Fri Feb  8 18:10:40 2008
@@ -61,28 +61,28 @@
 
 <& /Elements/CollectionList,
     order_by => 'name',
-    Order   => 'ASC',
+    order   => 'ASC',
     Rows    => 0,
     %ARGS,
     display_format => "__CheckBox.{Delete}__,$format",
     format => $format,
     Collection => $is_member,
     AllowSorting => 1,
-    PassArguments => [qw(format Rows Page Order order_by id)],
+    PassArguments => [qw(format Rows Page order order_by id)],
 &>
 
 <h2><&|/l&>Groups the user is not member of (check box to add)</&></h2>
 
 <& /Elements/CollectionList,
     order_by => 'name',
-    Order   => 'ASC',
+    order   => 'ASC',
     Rows    => 100,
     %ARGS,
     display_format => "__CheckBox.{Add}__,'__has_member_recursively.{$id}__/TITLE:Recursive',$format",
     format => $format,
     Collection => $is_not_member,
     AllowSorting => 1,
-    PassArguments => [qw(format Rows Page Order order_by)],
+    PassArguments => [qw(format Rows Page order order_by)],
 &>
 
 <& /Elements/Submit, Label => _('Update'), name => 'Update' &>

Modified: rt/branches/3.999-DANGEROUS/html/Admin/Users/index.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Users/index.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Users/index.html	Fri Feb  8 18:10:40 2008
@@ -58,13 +58,13 @@
 
 <& /Elements/CollectionList,
     order_by => 'name',
-    Order => 'ASC',
+    order => 'ASC',
     Rows  => 100,
     %ARGS,
     format => $format,
     Collection => $users,
     AllowSorting => 1,
-    PassArguments => [qw(format Rows Page Order order_by UserString UserOp UserField IdLike EmailLike FinddisabledUsers)],
+    PassArguments => [qw(format Rows Page order order_by UserString UserOp UserField IdLike EmailLike FinddisabledUsers)],
 &>
 
 % my $ids = join ',', map $_->id, @{ $users->items_array_ref };
@@ -79,7 +79,7 @@
 % }
 
 <form method="post" action="<% RT->config->get('WebPath') %>/Admin/Users/index.html">
-% foreach my $field( qw(format Rows Page Order order_by) ) {
+% foreach my $field( qw(format Rows Page order order_by) ) {
 %     next unless defined $ARGS{ $field } && length $ARGS{ $field };
 <input type="hidden" name="<% $field %>" value="<% $ARGS{ $field } %>" />
 % }

Modified: rt/branches/3.999-DANGEROUS/html/Elements/CollectionAsTable/Header
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/CollectionAsTable/Header	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/CollectionAsTable/Header	Fri Feb  8 18:10:40 2008
@@ -51,7 +51,7 @@
 @format       => undef
 $format_string => undef
 @order_by      => ()
- at Order        => ()
+ at order        => ()
 $query        => undef
 $Rows         => undef
 $Page         => undef
@@ -60,7 +60,7 @@
 
 $AllowSorting  => undef
 $baseURL       => undef
- at PassArguments => qw(query format rows page Order order_by)
+ at PassArguments => qw(query format rows page order order_by)
 </%ARGS>
 <tr class="collection-as-table">
 <%PERL>
@@ -126,14 +126,14 @@
       )
     {
         my $new_order = 'ASC';
-        $new_order = $Order[0] eq 'ASC'? 'DESC': 'ASC'
+        $new_order = $order[0] eq 'ASC'? 'DESC': 'ASC'
             if $order_by[0] && $order_by[0] eq $attr;
 
         $m->out(
             '<a href="' . $baseURL
             . $m->comp( '/Elements/QueryString',
                 %generic_query_args,
-                order_by => $attr, Order => $new_order
+                order_by => $attr, order => $new_order
             )
             . '">'. $title .'</a>'
         );

Modified: rt/branches/3.999-DANGEROUS/html/Elements/CollectionList
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/CollectionList	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/CollectionList	Fri Feb  8 18:10:40 2008
@@ -53,7 +53,7 @@
     Class        => $Class,
     format       => \@format,
     format_string => $format,
-    Order        => \@Order,
+    order        => \@order,
     order_by      => \@order_by,
     Rows         => $Rows,
     Page         => $Page,
@@ -104,10 +104,10 @@
 if ( @order_by ) {
     if ( $order_by[0] =~ /\|/ ) {
         @order_by = split /\|/, $order_by[0];
-        @Order = split /\|/,$Order[0];
+        @order = split /\|/,$order[0];
     }
     $Collection->order_by(
-        map { { column => $order_by[$_], order => $Order[$_] } }
+        map { { column => $order_by[$_], order => $order[$_] } }
         ( 0 .. $#order_by )
     );
 }
@@ -150,7 +150,7 @@
 $format        => undef
 $display_format => undef
 
- at Order         => ()
+ at order         => ()
 @order_by       => ()
 
 $Rows          => undef
@@ -158,7 +158,7 @@
 
 $Title         => _('Ticket Search')
 $baseURL       => RT->config->get('WebPath') . $m->request_comp->path .'?'
- at PassArguments => qw(query format rows page Order order_by)
+ at PassArguments => qw(query format rows page order order_by)
 
 $AllowSorting   => 0
 $ShowNavigation => 1

Modified: rt/branches/3.999-DANGEROUS/html/Elements/TicketList
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/TicketList	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/TicketList	Fri Feb  8 18:10:40 2008
@@ -52,7 +52,7 @@
     format => \@format, 
     format_string => $format,
     AllowSorting => $AllowSorting, 
-    Order => $Order, 
+    order => $order, 
     query => $query,
     Rows => $Rows,
     Page => $Page,
@@ -91,7 +91,7 @@
     format  => $format,
     Rows    => $Rows,
     order_by => $order_by,
-    Order   => $Order,
+    order   => $order,
     Page    => ( $Page - 1 )
 );
 my $next = $m->comp(
@@ -100,7 +100,7 @@
     format  => $format,
     Rows    => $Rows,
     order_by => $order_by,
-    Order   => $Order,
+    order   => $order,
     Page    => ( $Page + 1 )
 );
 </%perl>
@@ -123,13 +123,13 @@
 if ($order_by =~ /\|/) {
     # Multiple Sorts
     my @order_by = split /\|/,$order_by;
-    my @Order = split /\|/,$Order;
+    my @order = split /\|/,$order;
     $Collection->order_by(
-        map { { column => $order_by[$_], order => $Order[$_] } }
+        map { { column => $order_by[$_], order => $order[$_] } }
         ( 0 .. $#order_by )
     );
 } else {
-    $Collection->order_by(column => $order_by, order => $Order); 
+    $Collection->order_by(column => $order_by, order => $order); 
 }
 
 $Page = 1 unless $Page && $Page > 0; # workaround problems with Page = '' or undef
@@ -166,7 +166,7 @@
 $query => undef
 $format => RT->config->get('DefaultSearchResultFormat')
 $display_format => undef
-$Order => undef
+$order => undef
 $order_by => undef
 $Rows => 50
 

Modified: rt/branches/3.999-DANGEROUS/html/Prefs/Search.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Prefs/Search.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Prefs/Search.html	Fri Feb  8 18:10:40 2008
@@ -76,7 +76,7 @@
 my @actions;
 my $title = _("Customize").' ';
 
-my @fields = qw(format Order order_by rows_per_page);
+my @fields = qw(format order order_by rows_per_page);
 $ARGS{name} ||= '';
 my ($class, $id) = ( $ARGS{name} =~ m/^(.*)-(\d+)$/ );
 
@@ -88,12 +88,12 @@
 $title .= _($search->description, _('"N"'));
 my $user = Jifty->web->current_user->user_object;
 my $SearchArg = $user->preferences($search, $search->content);
-$ARGS{Order}       = (ref $ARGS{Order}   ? join('|',grep {/\S/} @{$ARGS{Order}})   : $ARGS{Order});
+$ARGS{order}       = (ref $ARGS{order}   ? join('|',grep {/\S/} @{$ARGS{order}})   : $ARGS{order});
 $ARGS{order_by}     = (ref $ARGS{order_by} ? join('|',grep {/\S/} @{$ARGS{order_by}}) : $ARGS{order_by});
 for (@fields) {
     $ARGS{$_} = $SearchArg->{$_} unless defined $ARGS{$_};
 }
-$ARGS{'Order'} = join '|', grep defined && /\S/, (ref $ARGS{'Order'})? @{$ARGS{'Order'}}: $ARGS{'Order'};
+$ARGS{'order'} = join '|', grep defined && /\S/, (ref $ARGS{'order'})? @{$ARGS{'order'}}: $ARGS{'order'};
 $ARGS{'order_by'} = join '|', grep defined && /\S/, (ref $ARGS{'order_by'})? @{$ARGS{'order_by'}}: $ARGS{'order_by'};
 
 my ( $AvailableColumns, $current_format );

Modified: rt/branches/3.999-DANGEROUS/html/Prefs/SearchOptions.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Prefs/SearchOptions.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Prefs/SearchOptions.html	Fri Feb  8 18:10:40 2008
@@ -59,23 +59,23 @@
             current_format => $current_format, 
             rows_per_page => $rows_per_page, 
             order_by => $order_by, 
-            Order => $Order &>
+            order => $order &>
 
 <& /Elements/Submit, name => 'SavePreferences', Label => _('Save Changes') &>
 </form>
 <%INIT>
 
 # {{{ If we're saving search preferences, do that now
-$Order = join '|', grep defined && /\S/, (ref $Order)? @{$Order}: $Order;
+$order = join '|', grep defined && /\S/, (ref $order)? @{$order}: $order;
 $order_by = join '|', grep defined && /\S/, (ref $order_by)? @{$order_by}: $order_by;
 
-$Order       = (ref $Order   ? join('|',grep {/\S/} @{$Order})   : $Order);
+$order       = (ref $order   ? join('|',grep {/\S/} @{$order})   : $order);
 $order_by     = (ref $order_by ? join('|',grep {/\S/} @{$order_by}) : $order_by);
 if ($ARGS{'SavePreferences'}) {
     Jifty->web->current_user->user_object->set_preferences("SearchDisplay",
     {
        format      => $format,
-       Order       => $Order,
+       order       => $order,
        order_by     => $order_by,
        rows_per_page => $rows_per_page,
     });
@@ -87,7 +87,7 @@
 my $prefs = Jifty->web->current_user->user_object->preferences("SearchDisplay") || {};
 
 $format      ||= $prefs->{'format'};
-$Order       ||= ($prefs->{'Order'} || 'ASC');
+$order       ||= ($prefs->{'order'} || 'ASC');
 $order_by     ||= ($prefs->{'order_by'} || 'id');
 ($rows_per_page =  defined( $prefs->{'rows_per_page'} ) ? $prefs->{'rows_per_page'}  : 50) unless defined ($rows_per_page);
 
@@ -101,7 +101,7 @@
 <%ARGS>
 $format => undef
 $description => undef
-$Order => undef
+$order => undef
 $order_by => undef
 $rows_per_page => undef
 </%ARGS>

Modified: rt/branches/3.999-DANGEROUS/html/Search/Build.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Build.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Build.html	Fri Feb  8 18:10:40 2008
@@ -118,7 +118,7 @@
 my $title = _("Query Builder");
 
 my %query;
-for( qw(query format order_by Order rows_per_page) ) {
+for( qw(query format order_by order rows_per_page) ) {
     $query{$_} = $ARGS{$_};
 }
 
@@ -143,15 +143,15 @@
 
     my $current = $session{'CurrentSearchHash'};
     my $prefs = Jifty->web->current_user->user_object->preferences("SearchDisplay") || {};
-    my $default = {query => '', format => '', order_by => 'id', Order => 'ASC', rows_per_page => 50 };
+    my $default = {query => '', format => '', order_by => 'id', order => 'ASC', rows_per_page => 50 };
 
-    for( qw(query format order_by Order rows_per_page) ) {
+    for( qw(query format order_by order rows_per_page) ) {
         $query{$_} = $current->{$_} unless defined $query{$_};
         $query{$_} = $prefs->{$_} unless defined $query{$_};
         $query{$_} = $default->{$_} unless defined $query{$_};
     }
 
-    for( qw(Order order_by) ) {
+    for( qw(order order_by) ) {
         if (ref $query{$_} eq "ARRAY") {
             $query{$_} = join( '|', @{ $query{$_} } );
         }

Modified: rt/branches/3.999-DANGEROUS/html/Search/Bulk.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Bulk.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Bulk.html	Fri Feb  8 18:10:40 2008
@@ -53,11 +53,11 @@
     query => $query,
     Rows => $Rows,
     order_by => $order_by,
-    Order => $Order &>
+    order => $order &>
 
 <& /Elements/ListActions, actions => \@results &>
 <form method="post" action="<% RT->config->get('WebPath') %>/Search/Bulk.html" enctype="multipart/form-data">
-% foreach my $var qw(query format order_by Order Rows Page) {
+% foreach my $var qw(query format order_by order Rows Page) {
 <input type="hidden" class="hidden" name="<%$var%>" value="<%$ARGS{$var} || ''%>" />
 %}
 <& /Elements/TicketList, query => $query,
@@ -66,7 +66,7 @@
     Verbatim => 1,
     AllowSorting => 1,
     order_by => $order_by,
-    Order => $Order,
+    order => $order,
     Rows => $Rows,
     Page => $Page,
     baseURL => RT->config->get('WebPath')."/Search/Bulk.html?"
@@ -219,13 +219,13 @@
 
   # Multiple Sorts
   my @order_by = split /\|/, $order_by;
-  my @Order   = split /\|/, $Order;
+  my @order   = split /\|/, $order;
   $Tickets->order_by(
-    map { { column => $order_by[$_], order => $Order[$_] } }
+    map { { column => $order_by[$_], order => $order[$_] } }
       ( 0 .. $#order_by ) );
 }
 else {
-  $Tickets->order_by( column => $order_by, order => $Order );
+  $Tickets->order_by( column => $order_by, order => $order );
 }
 
 $Page = 1 unless $Page && $Page > 0; # workaround problems with Page = '' or undef
@@ -372,7 +372,7 @@
 $format => undef
 $Page => 1
 $Rows => 50
-$Order => 'ASC'
+$order => 'ASC'
 $order_by => 'id'
 $query => undef
 </%args>

Modified: rt/branches/3.999-DANGEROUS/html/Search/Edit.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Edit.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Edit.html	Fri Feb  8 18:10:40 2008
@@ -53,7 +53,7 @@
     query   => $query,
     Rows    => $Rows,
     order_by => $order_by,
-    Order   => $Order,
+    order   => $order,
     SavedSearchId => $SavedSearchId,
 &>
 
@@ -76,7 +76,7 @@
                            format  => $format,
                            Rows    => $Rows,
                            order_by => $order_by,
-                           Order   => $Order,
+                           order   => $order,
                           );
 
 </%INIT>
@@ -89,7 +89,7 @@
 $format        => ''
 $Rows          => '50'
 $order_by       => 'id'
-$Order         => 'ASC'
+$order         => 'ASC'
 
 @actions       => ()
 </%ARGS>

Modified: rt/branches/3.999-DANGEROUS/html/Search/Elements/DisplayOptions
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Elements/DisplayOptions	(original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Elements/DisplayOptions	Fri Feb  8 18:10:40 2008
@@ -55,11 +55,11 @@
 <table valign="top">
 
 % for my $o (0..3) {
-% $Order[$o] ||= ''; $order_by[$o] ||= '';
+% $order[$o] ||= ''; $order_by[$o] ||= '';
 <tr>
 <td class="label">
 % if ($o == 0) {
-<&|/l&>Order by</&>:
+<&|/l&>order by</&>:
 % }
 </td>
 <td class="value">
@@ -76,14 +76,14 @@
 ><&|/l&><%$field%></&></option>
 % }
 </select>
-<select name="Order">
+<select name="order">
 <option value="ASC"
-% unless ( ($Order[$o]||'') eq "DESC" ) {
+% unless ( ($order[$o]||'') eq "DESC" ) {
 selected
 % }
 ><&|/l&>Asc</&></option>
 <option value="DESC"
-% if ( ($Order[$o]||'') eq "DESC" ) {
+% if ( ($order[$o]||'') eq "DESC" ) {
 selected
 % }
 ><&|/l&>Desc</&></option>
@@ -120,18 +120,18 @@
 # Add PAW sort
 $fields{'Custom.Ownership'} = 1;
 
-my @Order = split /\|/, $Order;
+my @order = split /\|/, $order;
 my @order_by = split /\|/, $order_by;
-if ($Order =~ /\|/) {
-    @Order = split /\|/, $Order;
+if ($order =~ /\|/) {
+    @order = split /\|/, $order;
 } else {
-    @Order = ( $Order );
+    @order = ( $order );
 }
 
 </%INIT>
 
 <%ARGS>
-$Order => undef
+$order => undef
 $order_by => undef
 $rows_per_page => undef
 $format => undef

Modified: rt/branches/3.999-DANGEROUS/html/Search/Elements/EditSearches
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Elements/EditSearches	(original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Elements/EditSearches	Fri Feb  8 18:10:40 2008
@@ -119,7 +119,7 @@
 </%ARGS>
 <%INIT>
 
-my @columns = qw(query format order_by Order rows_per_page);
+my @columns = qw(query format order_by order rows_per_page);
 
 $SavedSearch->{'id'}          = $ARGS{'SavedSearchId'}          || 'new';
 $SavedSearch->{'description'} = $ARGS{'SavedSearchdescription'} || '';

Modified: rt/branches/3.999-DANGEROUS/html/Search/Elements/ResultViews
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Elements/ResultViews	(original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Elements/ResultViews	Fri Feb  8 18:10:40 2008
@@ -51,7 +51,7 @@
 $format => undef
 $Rows => undef
 $order_by => undef
-$Order => undef
+$order => undef
 $RSSFeedURL => undef
 $Shortquery_string => undef
 
@@ -63,7 +63,7 @@
 <a href="<%RT->config->get('WebPath')%>/Tools/Offline.html<%$Shortquery_string%>"><&|/l&>Work offline</&></a><br />
 
 <form method="get" action="<%RT->config->get('WebPath')%>/Search/Chart.html"><&|/l&>chart</&>
-% my %hiddens = (query => $query, format => $format, Rows => $Rows, order_by => $order_by, Order => $Order);
+% my %hiddens = (query => $query, format => $format, Rows => $Rows, order_by => $order_by, order => $order);
 % foreach my $key (keys(%hiddens)) {
 <input type="hidden" class="hidden" name="<%$key%>" value="<%defined($hiddens{$key})?$hiddens{$key}:''%>" />
 % }

Modified: rt/branches/3.999-DANGEROUS/html/Search/Results.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Results.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Results.html	Fri Feb  8 18:10:40 2008
@@ -54,19 +54,19 @@
     query => $query,
     Rows => $Rows,
     order_by => $order_by,
-    Order => $Order &>
+    order => $order &>
 <& /Elements/TicketList, 
     query => $query,
     AllowSorting => 1,
     order_by => $order_by,
-    Order => $Order,
+    order => $order,
     Rows => $Rows,
     Page => $Page,
     format => $format,
     baseURL => RT->config->get('WebPath')."/Search/Results.html?"
 
    &>
-% my %hiddens = (query => $query, format => $format, Rows => $Rows, order_by => $order_by, Order => $Order, HideResults => $HideResults, Page => $Page );
+% my %hiddens = (query => $query, format => $format, Rows => $Rows, order_by => $order_by, order => $order, HideResults => $HideResults, Page => $Page );
 <div align="right">
 <form method="get" action="<%RT->config->get('WebPath')%>/Search/Results.html">
 % foreach my $key (keys(%hiddens)) {
@@ -83,7 +83,7 @@
     format => $format,
     Rows => $Rows,
     order_by => $order_by,
-    Order => $Order,
+    order => $order,
     RSSFeedURL => $RSSFeedURL,
     short_querystring => $short_querystring,
 &>
@@ -96,7 +96,7 @@
 # These variables are what define a search_hash; this is also
 # where we give sane defaults.
 $format      ||= $prefs->{'format'} || RT->config->get('DefaultSearchResultFormat');
-$Order       ||= $prefs->{'Order'} || 'ASC';
+$order       ||= $prefs->{'order'} || 'ASC';
 $order_by     ||= $prefs->{'order_by'} || 'id';
 
 # Some forms pass in "rows_per_page" rather than "Rows"
@@ -120,19 +120,19 @@
 if ($order_by =~ /\|/) {
     # Multiple Sorts
     my @order_by = split /\|/,$order_by;
-    my @Order = split /\|/,$Order;
+    my @order = split /\|/,$order;
     $session{'tickets'}->order_by(
-        map { { column => $order_by[$_], order => $Order[$_] } } ( 0
+        map { { column => $order_by[$_], order => $order[$_] } } ( 0
         .. $#order_by ) );; 
 } else {
-    $session{'tickets'}->order_by(column => $order_by, order => $Order); 
+    $session{'tickets'}->order_by(column => $order_by, order => $order); 
 }
 
 $session{'CurrentSearchHash'} = {
     format      => $format,
     query       => $query,
     Page       => $Page,
-    Order       => $Order,
+    order       => $order,
     order_by     => $order_by,
     rows_per_page => $Rows
     };
@@ -150,7 +150,7 @@
                                format => $format,
                                Rows => $Rows,
                                order_by => $order_by,
-                               Order => $Order,
+                               order => $order,
                                Page => $Page);
 my $short_querystring = "?".$m->comp('/Elements/QueryString', query => $query);
 my $RSSFeedURL = RT->config->get('WebPath')."/Search/Results.rdf$short_querystring";
@@ -169,5 +169,5 @@
 $Rows => undef
 $Page => 1
 $order_by => undef
-$Order => undef
+$order => undef
 </%ARGS>

Modified: rt/branches/3.999-DANGEROUS/html/Search/Results.tsv
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Results.tsv	(original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Results.tsv	Fri Feb  8 18:10:40 2008
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <%ARGS>
 $order_by => 'id'
-$Order => 'ASC'
+$order => 'ASC'
 </%ARGS>
 <%INIT>
 
@@ -57,13 +57,13 @@
 
   # Multiple Sorts
   my @order_by = split /\|/, $order_by;
-  my @Order   = split /\|/, $Order;
+  my @order   = split /\|/, $order;
   $Tickets->order_by(
-    map { { column => $order_by[$_], order => $Order[$_] } }
+    map { { column => $order_by[$_], order => $order[$_] } }
       ( 0 .. $#order_by ) );
 }
 else {
-  $Tickets->order_by( column => $order_by, order => $Order );
+  $Tickets->order_by( column => $order_by, order => $order );
 }
 
 my @rows;

Modified: rt/branches/3.999-DANGEROUS/html/SelfService/Elements/MyRequests
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/SelfService/Elements/MyRequests	(original)
+++ rt/branches/3.999-DANGEROUS/html/SelfService/Elements/MyRequests	Fri Feb  8 18:10:40 2008
@@ -49,7 +49,7 @@
 <& /Elements/TicketList, Title   => $title,
 			 format  => @format, 
 			 query   => $query, 
-			 Order   => $Order, 
+			 order   => $order, 
 			 order_by => $order_by,
 			 baseURL => $baseURL,
 			 Page    => $Page &>
@@ -65,7 +65,7 @@
         . join( ' OR ', map "Status = '$_'", @status )
         . " )";
 }
-my $Order = "ASC";
+my $order = "ASC";
 my $order_by = "Created";
 my @format = qq{
    '<B><A HREF="}. RT->config->get('WebPath') .qq{/SelfService/Display.html?id=__id__">__id__</a></B>/TITLE:#',

Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs	(original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs	Fri Feb  8 18:10:40 2008
@@ -204,7 +204,7 @@
     query         => $ARGS{'query'}         || $session{'CurrentSearchHash'}->{'query'},
     format        => $ARGS{'format'}        || $session{'CurrentSearchHash'}->{'format'},
     order_by       => $ARGS{'order_by'}       || $session{'CurrentSearchHash'}->{'order_by'},
-    Order         => $ARGS{'Order'}         || $session{'CurrentSearchHash'}->{'Order'},
+    order         => $ARGS{'order'}         || $session{'CurrentSearchHash'}->{'order'},
     Page          => $ARGS{'Page'}          || $session{'CurrentSearchHash'}->{'Page'},
     Rows          => $ARGS{'Rows'},
   ) if ($ARGS{'query'} or $session{'CurrentSearchHash'}->{'query'});

Modified: rt/branches/3.999-DANGEROUS/html/Tools/MyDay.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Tools/MyDay.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Tools/MyDay.html	Fri Feb  8 18:10:40 2008
@@ -108,7 +108,7 @@
 }
 
 my $tickets = RT::Model::TicketCollection->new();
-$tickets->from_sql("Status = 'new' or Status = 'open' AND owner = '".Jift->web->current_user->id"'");
+$tickets->from_sql("Status = 'new' or Status = 'open' AND owner = '".Jifty->web->current_user->id."'");
 $tickets->order_by ( column => 'priority', order => 'DESC');
 
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm	Fri Feb  8 18:10:40 2008
@@ -65,8 +65,8 @@
     column name => max_length is 200, type is 'varchar(200)', default is '';
     column type => max_length is 200, type is 'varchar(200)', default is '';
     column max_values => max_length is 11, type is 'int', default is '0';
-    column pattern => type is 'longtext', default is '';
-    column repeated => max_length is 6, type is 'smallint(6)', default is '0';
+    column pattern => type is 'text', default is '';
+    column repeated => max_length is 6, type is 'smallint', default is '0';
     column
         description => max_length is 255,
         type is 'varchar(255)', default is '';
@@ -80,7 +80,7 @@
         last_updated_by => max_length is 11,
         type is 'int', default is '0';
     column last_updated => type is 'timestamp';
-    column disabled => max_length is 6, type is 'smallint(6)', default is '0';
+    column disabled => max_length is 6, type is 'smallint', default is '0';
 };
 
 our %FieldTypes = (
@@ -172,11 +172,11 @@
   varchar(200) 'type'.
   int 'max_values'.
   varchar(255) 'pattern'.
-  smallint(6) 'repeated'.
+  smallint 'repeated'.
   varchar(255) 'description'.
   int 'sort_order'.
   varchar(255) 'lookup_type'.
-  smallint(6) 'disabled'.
+  smallint 'disabled'.
 
 C<lookup_type> is generally the result of either
 C<RT::Model::Ticket->custom_field_lookup_type> or C<RT::Model::Transaction->custom_field_lookup_type>.

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm	Fri Feb  8 18:10:40 2008
@@ -133,7 +133,7 @@
     if ( $identifier !~ /\D/ ) {
         $self->SUPER::load_by_id($identifier);
     } else {
-        Jifty->log->fatal("Group -> Load called with a bogus argument");
+        Jifty->log->fatal("Group -> Load called with a bogus argument: $identifier");
         return undef;
     }
 }
@@ -255,7 +255,7 @@
 
     Ticket is the TicketId we're curious about
     type is the type of Group we're trying to load: 
-        Requestor, Cc, AdminCc, Owner
+        requestor, cc, admin_cc, owner
 
 =cut
 
@@ -271,6 +271,8 @@
         instance => $args{'ticket'},
         type     => $args{'type'}
     );
+
+    Carp::confess("AAA NO ROLE") unless $self->id;
 }
 
 # }}}
@@ -285,7 +287,7 @@
 
     queue is the QueueId we're curious about
     type is the type of Group we're trying to load: 
-        Requestor, Cc, AdminCc, Owner
+        requestor, cc, admin_cc, owner
 
 =cut
 
@@ -314,7 +316,7 @@
 Takes a single param: type
 
     type is the type of Group we're trying to load: 
-        Requestor, Cc, AdminCc, Owner
+        requestor, cc, admin_cc, owner
 
 =cut
 
@@ -459,7 +461,7 @@
 
 # }}}
 
-# {{{ Ccreateacl_equivalence_group
+# {{{ ccreateacl_equivalence_group
 
 =head2 _createacl_equivalence_group { Principal }
 
@@ -565,7 +567,7 @@
 =head2 CreateRoleGroup { domain => DOMAIN, type =>  TYPE, instance => ID }
 
 A helper subroutine which creates a  ticket group. (What RT 2.0 called Ticket watchers)
-type is one of ( "Requestor" || "Cc" || "AdminCc" || "Owner") 
+type is one of ( "requestor" || "cc" || "admin_cc" || "owner") 
 domain is one of (RT::Model::Ticket-Role || RT::Model::Queue-Role || RT::System-Role)
 instance is the id of the ticket or queue in question
 
@@ -1335,22 +1337,14 @@
 
 sub principal_object {
     my $self = shift;
-    unless (
-           defined $self->{'principal_object'}
-        && defined $self->{'principal_object'}->object_id
-        && ( $self->{'principal_object'}->object_id == $self->id )
-        && ( defined $self->{'principal_object'}->principal_type
-            && $self->{'principal_object'}->principal_type eq 'Group' )
-        )
-    {
-
+    unless ($self->{'principal_object'} && $self->{'principal_object'}->id) {
         $self->{'principal_object'} = RT::Model::Principal->new;
         $self->{'principal_object'}->load_by_cols(
-            'object_id'      => $self->id,
-            'principal_type' => 'Group'
+            id      => $self->id,
+            principal_type => 'Group'
         );
     }
-    return ( $self->{'principal_object'} );
+    return $self->{'principal_object'};
 }
 
 =head2 principal_id  

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupMember.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupMember.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupMember.pm	Fri Feb  8 18:10:40 2008
@@ -65,8 +65,8 @@
         && UNIVERSAL::isa( $args{'group'}, 'RT::Model::Principal' )
         && $args{'group'}->id )
     {
-
-        Jifty->log->warn("GroupMember::Create called with a bogus Group arg");
+        Carp::cluck();
+        Jifty->log->warn("GroupMember::Create called with a bogus group arg: ".$args{'group'});
         return (undef);
     }
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/LinkCollection.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/LinkCollection.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/LinkCollection.pm	Fri Feb  8 18:10:40 2008
@@ -94,7 +94,7 @@
     }
 
     # If we're limiting by target, order by base
-    # (Order by the thing that's changing)
+    # (order by the thing that's changing)
 
     if (   ( $args{'column'} eq 'target' )
         or ( $args{'column'} eq 'local_target' ) )

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/ObjectCustomFieldValue.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/ObjectCustomFieldValue.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/ObjectCustomFieldValue.pm	Fri Feb  8 18:10:40 2008
@@ -66,7 +66,7 @@
     column
         last_updated_by => type is 'int',
         max_length is 11, default is '0';
-    column disabled => type is 'smallint(6)', max_length is 6, default is '0';
+    column disabled => type is 'smallint', max_length is 6, default is '0';
     column sort_order => type is 'int', max_length is 11, default is '0';
     column Created => type is 'timestamp';
     column custom_field => type is 'int', max_length is 11, default is '0';

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm	Fri Feb  8 18:10:40 2008
@@ -107,7 +107,7 @@
         last_updated_by => max_length is 11,
         type is 'int', default is '0';
     column last_updated => type is 'timestamp';
-    column disabled => max_length is 6, type is 'smallint(6)', default is '0';
+    column disabled => max_length is 6, type is 'smallint', default is '0';
 };
 our @DEFAULT_ACTIVE_STATUS   = qw(new open stalled);
 our @DEFAULT_INACTIVE_STATUS = qw(resolved rejected deleted);

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripCollection.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripCollection.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripCollection.pm	Fri Feb  8 18:10:40 2008
@@ -313,7 +313,7 @@
 
 =head2 _FindScrips
 
-Find only the apropriate scrips for whatever we're doing now.  Order them 
+Find only the apropriate scrips for whatever we're doing now.  order them 
 by their description.  (Most common use case is to prepend a number to the
 description, forcing the scrips to display and run in ascending alphanumerical 
 order.)

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm	Fri Feb  8 18:10:40 2008
@@ -105,7 +105,7 @@
     column last_updated => type is 'timestamp';
     column creator => max_length is 11,   type is 'int', default is '0';
     column created => type is 'timestamp';
-    column disabled => max_length is 6, type is 'smallint(6)', default is '0';
+    column disabled => max_length is 6, type is 'smallint', default is '0';
 };
 
 use RT::Model::Queue;
@@ -851,7 +851,7 @@
     my $owner_obj = RT::Model::Group->new;
     $owner_obj->load_ticket_role_group(
         ticket => $self->id,
-        type   => 'Owner'
+        type   => 'owner'
     );
     return ($owner_obj);
 }

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/TicketCollection.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/TicketCollection.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/TicketCollection.pm	Fri Feb  8 18:10:40 2008
@@ -846,7 +846,6 @@
             operator => $op,
             value    => $value,
         );
-        $users_obj->order_by;
         $users_obj->rows_per_page(2);
         my @users = @{ $users_obj->items_array_ref };
 
@@ -1393,7 +1392,7 @@
     my @res   = ();
     my $order = 0;
     foreach my $row (@args) {
-        if ( $row->{alias} || $row->{column} !~ /\./ ) {
+        if ( $row->{alias} || ( $row->{column} ||'') !~ /\./ ) {
             push @res, $row;
             next;
         }

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm	Fri Feb  8 18:10:40 2008
@@ -38,8 +38,8 @@
     column
         reference_type => max_length is 255,
         type is 'varchar(255)', default is '';
-    column old_reference => max_length is 11, type is 'int', default is '';
-    column new_reference => max_length is 11, type is 'int', default is '';
+    column old_reference => max_length is 11, type is 'int', default is '0';
+    column new_reference => max_length is 11, type is 'int', default is '0';
     column data => max_length is 255, type is 'varchar(255)', default is '';
     column creator => max_length is 11, type is 'int', default is '0';
     column created => type is 'timestamp';

Modified: rt/branches/3.999-DANGEROUS/share/po/cs.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/cs.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/cs.po	Fri Feb  8 18:10:40 2008
@@ -3788,11 +3788,11 @@
 msgstr "Volby"
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "Řadit podle"
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "Řazení a třídění"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/da.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/da.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/da.po	Fri Feb  8 18:10:40 2008
@@ -4222,11 +4222,11 @@
 msgstr "Valgmuligheder"
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "Sorteret efter"
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "Sortering"
 
 #: html/Admin/Users/Modify.html:141

Modified: rt/branches/3.999-DANGEROUS/share/po/de.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/de.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/de.po	Fri Feb  8 18:10:40 2008
@@ -3365,7 +3365,7 @@
 msgstr "Optionen"
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "Sortiert nach"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/es.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/es.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/es.po	Fri Feb  8 18:10:40 2008
@@ -4014,11 +4014,11 @@
 msgstr "Opciones"
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "Ordenar por"
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "Ordenación y clasificación"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/fi.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/fi.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/fi.po	Fri Feb  8 18:10:40 2008
@@ -3824,11 +3824,11 @@
 msgstr ""
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "Järjestäminen"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/fr.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/fr.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/fr.po	Fri Feb  8 18:10:40 2008
@@ -3175,7 +3175,7 @@
 msgstr "Options"
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "Trier par"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/he.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/he.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/he.po	Fri Feb  8 18:10:40 2008
@@ -3302,11 +3302,11 @@
 msgstr ""
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "סידור ומיון"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/hu.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/hu.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/hu.po	Fri Feb  8 18:10:40 2008
@@ -3194,7 +3194,7 @@
 msgstr ""
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "Rendezés"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/id.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/id.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/id.po	Fri Feb  8 18:10:40 2008
@@ -3396,11 +3396,11 @@
 msgstr ""
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "Diurutkan sesuai"
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "Diurutkan dan disortir"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/it.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/it.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/it.po	Fri Feb  8 18:10:40 2008
@@ -4107,11 +4107,11 @@
 msgstr ""
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "Ordina per"
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "Ordinamento"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/ja.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/ja.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/ja.po	Fri Feb  8 18:10:40 2008
@@ -3640,11 +3640,11 @@
 msgstr ""
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "整列と並び替え"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/nl.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/nl.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/nl.po	Fri Feb  8 18:10:40 2008
@@ -3814,11 +3814,11 @@
 msgstr ""
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "Sorteer op"
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "Ordening en sortering"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/no.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/no.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/no.po	Fri Feb  8 18:10:40 2008
@@ -4059,11 +4059,11 @@
 msgstr ""
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "Rekkefølge og sortering"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/pt_br.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/pt_br.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/pt_br.po	Fri Feb  8 18:10:40 2008
@@ -4039,11 +4039,11 @@
 msgstr ""
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "Requisitando e ordenando"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/ru.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/ru.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/ru.po	Fri Feb  8 18:10:40 2008
@@ -4133,11 +4133,11 @@
 msgstr "Параметры"
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "Сортировать по"
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "Порядок и сортировка"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
@@ -5314,7 +5314,7 @@
 msgstr "Сортировка"
 
 #: NOT FOUND IN SOURCE
-msgid "Sort Order"
+msgid "Sort order"
 msgstr "Метод сортировки"
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.999-DANGEROUS/share/po/sv.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/sv.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/sv.po	Fri Feb  8 18:10:40 2008
@@ -3504,7 +3504,7 @@
 msgstr "Alternativ"
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "Sortera efter"
 
 #: html/Admin/Users/Modify.html:141

Modified: rt/branches/3.999-DANGEROUS/share/po/tr.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/tr.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/tr.po	Fri Feb  8 18:10:40 2008
@@ -3143,7 +3143,7 @@
 msgstr "Seçenekler"
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "Sıralama:"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/zh_cn.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/zh_cn.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/zh_cn.po	Fri Feb  8 18:10:40 2008
@@ -5186,11 +5186,11 @@
 msgstr ""
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "排序方式"
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "顺序与排序方式"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/share/po/zh_tw.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/zh_tw.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/zh_tw.po	Fri Feb  8 18:10:40 2008
@@ -5186,11 +5186,11 @@
 msgstr ""
 
 #: html/Search/Elements/DisplayOptions:59
-msgid "Order by"
+msgid "order by"
 msgstr "排序方式"
 
 #: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
+msgid "ordering and sorting"
 msgstr "順序與排序方式"
 
 #: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129

Modified: rt/branches/3.999-DANGEROUS/t/api/attribute-tests.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/attribute-tests.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/api/attribute-tests.t	Fri Feb  8 18:10:40 2008
@@ -18,7 +18,7 @@
 
 ok(1, $user->attributes->build_select_query);
 my $attr = $user->attributes;
-# XXX: Order by id as some tests depend on it
+# XXX: order by id as some tests depend on it
 $attr->order_by({ column => 'id' });
 
 ok(1, $attr->build_select_query);

Modified: rt/branches/3.999-DANGEROUS/t/api/scrip_order.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/scrip_order.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/api/scrip_order.t	Fri Feb  8 18:10:40 2008
@@ -10,7 +10,7 @@
 # {{{ test scrip ordering based on description
 
 my $scrip_queue = RT::Model::Queue->new(current_user => RT->system_user);
-my ($queue_id, $msg) = $scrip_queue->create( name => "ScripOrdering-$$", 
+my ($queue_id, $msg) = $scrip_queue->create( name => "Scripordering-$$", 
     description => 'Test scrip ordering by description' );
 ok($queue_id, "Created scrip-ordering test queue? ".$msg);
 

Modified: rt/branches/3.999-DANGEROUS/t/ticket/search_by_txn.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/search_by_txn.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/search_by_txn.t	Fri Feb  8 18:10:40 2008
@@ -22,7 +22,7 @@
 my ($id, $tid,$msg) = $ticket->create(queue => 'General', subject => $SUBJECT);
 ok($id,$msg);
 ok ($ticket->id, "We Created a ticket");
-my ($id, $txnid, $txnobj) =  $ticket->comment( content => 'A comment that happend on 2004-01-01');
+my ($commentid, $txnid, $txnobj) =  $ticket->comment( content => 'A comment that happend on 2004-01-01');
 
 isa_ok($txnobj, 'RT::Model::Transaction');
 

Modified: rt/branches/3.999-DANGEROUS/t/ticket/sort_by_cf.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/sort_by_cf.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/sort_by_cf.t	Fri Feb  8 18:10:40 2008
@@ -32,12 +32,12 @@
 my $cfB = RT::Model::CustomField->new(current_user => RT->system_user);
 my $cfC = RT::Model::CustomField->new(current_user => RT->system_user);
 
-($ret, $msg) = $cfO->create( name => 'Order',
+($ret, $msg) = $cfO->create( name => 'order',
                              queue => 0,
                              sort_order => 1,
                              description => q{Something to compare results for, since we can't guarantee ticket ID},
                              type=> 'FreeformSingle');
-ok($ret, "Custom Field Order Created");
+ok($ret, "Custom Field order Created");
 
 ($ret, $msg) = $cfA->create( name => 'Alpha',
                              queue => $queue_obj->id,
@@ -87,7 +87,7 @@
   }
   my $results = join (" ", at results);
   my $order = join(" ", at order);
-  @_ = ($results, $order , "Ordered correctly: $order");
+  @_ = ($results, $order , "ordered correctly: $order");
   goto \&is;
 }
 


More information about the Rt-commit mailing list