[Rt-commit] rt branch, master, updated. rt-4.1.6-92-g13228b3

Thomas Sibley trs at bestpractical.com
Wed Jan 16 23:59:33 EST 2013


The branch, master has been updated
       via  13228b3a31dbe1edcc25cc7a2807d9a5e3143511 (commit)
       via  d7b1dffb74da7ba7c2f06c468c9faf35a6a50283 (commit)
       via  639e3f37191bf5c5941cb7dabd72604915dc5094 (commit)
       via  b91fdc84dd6016f2ae00c2f6d6e0b0d8192c8c7d (commit)
       via  617f76bfcee9dd5fee932acc5c2351d253ba0f79 (commit)
       via  07273951d61a15a049316d1ffbb384e060f87226 (commit)
       via  3c2a5621099712d488b2f524ebf3e4c9131f92e1 (commit)
       via  785dc2e37d265de7f5422551e6c9ff6d3558c44d (commit)
      from  cd367a4ff90d175da19b53c021eda421be8601bb (commit)

Summary of changes:
 bin/rt-crontool.in                                 |  22 +-
 devel/tools/extract-message-catalog                |  22 +-
 devel/tools/rt-apache                              |  20 +-
 etc/acl.Pg                                         |   2 +-
 etc/initialdata                                    |  10 +-
 etc/schema.Oracle                                  | 554 ++++++++++-----------
 etc/schema.SQLite                                  |  16 +-
 etc/schema.mysql                                   |  16 +-
 etc/upgrade/3.1.0/schema.Oracle                    |  20 +-
 etc/upgrade/3.5.1/content                          |  16 +-
 etc/upgrade/3.7.85/content                         |  12 +-
 etc/upgrade/3.9.5/backcompat                       |   2 +-
 etc/upgrade/4.1.1/schema.Oracle                    |  16 +-
 lib/RT.pm                                          |   2 +-
 lib/RT/ACE.pm                                      |  60 +--
 lib/RT/Action/Autoreply.pm                         |  14 +-
 lib/RT/Action/CreateTickets.pm                     |  10 +-
 lib/RT/Action/EscalatePriority.pm                  |  86 ++--
 lib/RT/Action/LinearEscalate.pm                    |   2 +-
 lib/RT/Action/NotifyGroupAsComment.pm              |   6 +-
 lib/RT/Action/RecordComment.pm                     |  23 +-
 lib/RT/Action/RecordCorrespondence.pm              |  24 +-
 lib/RT/Article.pm                                  |  30 +-
 lib/RT/Attachment.pm                               |  30 +-
 lib/RT/Attachments.pm                              |   6 +-
 lib/RT/Attribute.pm                                |  38 +-
 lib/RT/CachedGroupMember.pm                        |  12 +-
 lib/RT/CachedGroupMembers.pm                       |   2 +-
 lib/RT/Class.pm                                    |  20 +-
 lib/RT/Condition.pm                                |  26 +-
 lib/RT/Condition/BeforeDue.pm                      |   4 +-
 lib/RT/Condition/Overdue.pm                        |   8 +-
 lib/RT/Condition/OwnerChange.pm                    |   6 +-
 lib/RT/Condition/PriorityChange.pm                 |   6 +-
 lib/RT/Condition/PriorityExceeds.pm                |   6 +-
 lib/RT/Condition/QueueChange.pm                    |   6 +-
 lib/RT/CustomFieldValues.pm                        |  18 +-
 lib/RT/CustomFields.pm                             |  34 +-
 lib/RT/Group.pm                                    |  60 +--
 lib/RT/GroupMember.pm                              |  14 +-
 lib/RT/GroupMembers.pm                             |   2 +-
 lib/RT/Groups.pm                                   |  24 +-
 lib/RT/I18N.pm                                     |  12 +-
 lib/RT/Interface/CLI.pm                            |  66 +--
 lib/RT/Link.pm                                     |  48 +-
 lib/RT/Links.pm                                    |  18 +-
 lib/RT/ObjectClass.pm                              |  24 +-
 lib/RT/ObjectCustomField.pm                        |  16 +-
 lib/RT/ObjectCustomFieldValue.pm                   |  28 +-
 lib/RT/ObjectCustomFieldValues.pm                  |  12 +-
 lib/RT/ObjectCustomFields.pm                       |   6 +-
 lib/RT/ObjectScrip.pm                              |  18 +-
 lib/RT/ObjectTopic.pm                              |  25 +-
 lib/RT/ObjectTopics.pm                             |   6 +-
 lib/RT/Principal.pm                                |   8 +-
 lib/RT/Queue.pm                                    |   8 +-
 lib/RT/Queues.pm                                   |   6 +-
 lib/RT/Record.pm                                   |  68 +--
 lib/RT/Scrip.pm                                    |  90 ++--
 lib/RT/ScripActions.pm                             |  14 +-
 lib/RT/ScripCondition.pm                           |  78 +--
 lib/RT/ScripConditions.pm                          |  14 +-
 lib/RT/Scrips.pm                                   |  42 +-
 lib/RT/SearchBuilder.pm                            |   8 +-
 lib/RT/SharedSetting.pm                            |   2 +-
 lib/RT/StyleGuide.pod                              | 392 +++++++--------
 lib/RT/Template.pm                                 |  32 +-
 lib/RT/Templates.pm                                |  28 +-
 lib/RT/Ticket.pm                                   |  50 +-
 lib/RT/Tickets.pm                                  |  10 +-
 lib/RT/Tickets_SQL.pm                              |   2 +-
 lib/RT/Topic.pm                                    |  12 +-
 lib/RT/Transaction.pm                              |  54 +-
 lib/RT/Transactions.pm                             |  32 +-
 lib/RT/URI.pm                                      |  14 +-
 lib/RT/URI/a.pm                                    |   8 +-
 lib/RT/URI/fsck_com_article.pm                     |  71 ++-
 sbin/rt-setup-database.in                          |   6 +-
 sbin/rt-shredder.in                                | 160 +++---
 share/html/Admin/Elements/EditCustomField          |  12 +-
 share/html/Admin/Elements/SelectSingleOrMultiple   |   2 +-
 share/html/Admin/Global/Template.html              |   4 +-
 share/html/Admin/Groups/Modify.html                |  14 +-
 share/html/Admin/Groups/index.html                 |  20 +-
 .../html/Admin/Tools/Shredder/Elements/PluginHelp  |   4 +-
 share/html/Admin/Tools/Shredder/autohandler        |   4 +-
 share/html/Admin/Users/Modify.html                 |  98 ++--
 share/html/Approvals/Elements/PendingMyApproval    |  18 +-
 share/html/Approvals/Elements/ShowDependency       |  24 +-
 share/html/Approvals/index.html                    |   6 +-
 .../Articles/Article/Elements/ShowSavedSearches    |   3 +-
 share/html/Articles/Article/Search.html            | 120 ++---
 share/html/Dashboards/Modify.html                  |   2 +-
 share/html/Elements/CollectionList                 |  32 +-
 share/html/Elements/CollectionListPaging           |  20 +-
 share/html/Elements/EditLinks                      |   2 +-
 share/html/Elements/HeaderJavascript               |   2 +-
 share/html/Elements/MessageBox                     |   2 +-
 share/html/Elements/RT__CustomField/ColumnMap      |  10 +-
 share/html/Elements/RT__Group/ColumnMap            |   8 +-
 share/html/Elements/RT__Scrip/ColumnMap            |   4 +-
 share/html/Elements/RT__Template/ColumnMap         |   8 +-
 share/html/Elements/SelectBoolean                  |   4 +-
 share/html/Elements/SelectDate                     |  15 +-
 share/html/Elements/SelectDateRelation             |   2 +-
 share/html/Elements/SelectMatch                    |  10 +-
 share/html/Elements/TicketList                     |   8 +-
 share/html/NoAuth/css/aileron/msie6.css            |   2 +-
 share/html/NoAuth/css/base/articles.css            |   2 +-
 share/html/NoAuth/js/jquery-ui-patch-datepicker.js |   4 +-
 share/html/Prefs/Quicksearch.html                  |   6 +-
 share/html/Prefs/Search.html                       |   4 +-
 share/html/REST/1.0/Forms/ticket/attachments       |  32 +-
 share/html/REST/1.0/Forms/ticket/default           |  14 +-
 share/html/REST/1.0/Forms/ticket/history           |  96 ++--
 share/html/REST/1.0/Forms/transaction/default      | 109 ++--
 share/html/REST/1.0/dhandler                       |  32 +-
 share/html/REST/1.0/search/ticket                  |  36 +-
 share/html/Search/Elements/BuildFormatString       |   2 +-
 share/html/Search/Elements/PickBasics              |   8 +-
 share/html/Search/Elements/SearchesForObject       |   4 +-
 share/html/Search/Elements/SelectLinks             |  14 +-
 share/html/Search/Results.html                     |   2 +-
 share/html/SelfService/Closed.html                 |   4 +-
 share/html/SelfService/Elements/MyRequests         |  18 +-
 share/html/SelfService/Prefs.html                  |   6 +-
 share/html/Ticket/Attachment/dhandler              |   2 +-
 share/html/Ticket/Create.html                      |  14 +-
 share/html/Ticket/Elements/EditPeople              |   4 +-
 share/html/Tools/Offline.html                      |  49 +-
 share/html/Widgets/SavedSearch                     |   4 +-
 share/html/Widgets/SelectionBox                    |  10 +-
 share/html/Widgets/TitleBoxStart                   |   4 +-
 share/html/m/_elements/login                       |   1 +
 share/html/m/ticket/create                         |  14 +-
 t/99-policy.t                                      |  34 +-
 t/api/cfsearch.t                                   |  24 +-
 t/api/cron.t                                       |  26 +-
 t/api/savedsearch.t                                |  66 +--
 t/api/system.t                                     |   4 +-
 t/articles/interface.t                             | 136 ++---
 t/articles/search-interface.t                      |  94 ++--
 t/articles/set-subject.t                           |  36 +-
 t/articles/upload-customfields.t                   |   2 +-
 t/customfields/api.t                               | 172 +++----
 t/mail/digest-attributes.t                         |  34 +-
 t/mail/gateway.t                                   |  10 +-
 t/mail/gnupg-incoming.t                            |   2 +-
 t/mail/mime_decoding.t                             |   2 +-
 t/mail/outlook.t                                   |  32 +-
 t/shredder/02group_member.t                        | 230 ++++-----
 t/shredder/02queue.t                               |  68 +--
 t/shredder/02template.t                            |  36 +-
 t/shredder/02user.t                                |   2 +-
 t/ticket/add-watchers.t                            |  13 +-
 t/web/custom_search.t                              |   2 +-
 t/web/dashboards-basics.t                          |   6 +-
 t/web/rights1.t                                    |  24 +-
 t/web/search_simple.t                              |   4 +-
 159 files changed, 2406 insertions(+), 2403 deletions(-)

- Log -----------------------------------------------------------------
commit 13228b3a31dbe1edcc25cc7a2807d9a5e3143511
Merge: cd367a4 d7b1dff
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Jan 16 19:36:31 2013 -0800

    Merge branch '4.2/untabify'
    
    Conflicts:
    	lib/RT/Record.pm
    	share/html/Elements/CollectionList
    	share/html/m/_elements/login
            Restored a missing </form> tag made obvious by the merge conflict

diff --cc share/html/Approvals/Elements/PendingMyApproval
index b468858,252031f..597e40f
--- a/share/html/Approvals/Elements/PendingMyApproval
+++ b/share/html/Approvals/Elements/PendingMyApproval
@@@ -87,18 -87,18 +87,18 @@@ my $created_before = RT::Date->new( $se
  my $created_after = RT::Date->new( $session{'CurrentUser'} );
  
  foreach ($tickets, $group_tickets) {
 -    $_->Limit( FIELD      => 'Type', VALUE => 'approval' );
 +    $_->LimitType( VALUE => 'approval' );
  
      if ( $ARGS{'ShowResolved'} ) {
- 	$_->LimitStatus( VALUE => 'resolved' );
+         $_->LimitStatus( VALUE => 'resolved' );
      }
      if ( $ARGS{'ShowRejected'} ) {
- 	$_->LimitStatus( VALUE => 'rejected' );
+         $_->LimitStatus( VALUE => 'rejected' );
      }
      if ( $ARGS{'ShowPending'} || ( !$ARGS{'ShowRejected'} && !$ARGS{'Resolved'} ) ) {
- 	$_->LimitStatus( VALUE => 'open' );
- 	$_->LimitStatus( VALUE => 'new' );
- 	$_->LimitStatus( VALUE => 'stalled' );
+         $_->LimitStatus( VALUE => 'open' );
+         $_->LimitStatus( VALUE => 'new' );
+         $_->LimitStatus( VALUE => 'stalled' );
      }
  
      if ( $ARGS{'CreatedBefore'} ) {
diff --cc share/html/Elements/CollectionList
index 4b92dfc,4bdff68..1f6db3e
--- a/share/html/Elements/CollectionList
+++ b/share/html/Elements/CollectionList
@@@ -112,24 -112,23 +112,24 @@@ if ($Class =~ /::/) { # older passed i
  }
  
  $m->out('<table class="' .
- 	($Collection->isa('RT::Tickets') ? 'ticket-list' : 'collection') . ' collection-as-table">');
+             ($Collection->isa('RT::Tickets') ? 'ticket-list' : 'collection') . ' collection-as-table">');
  
  if ( $ShowHeader ) {
--  $m->comp('/Elements/CollectionAsTable/Header',
- 	   %ARGS,
- 	   Class        => $Class,
- 	   Format       => \@Format,
- 	   FormatString => $Format,
- 	   Order        => \@Order,
- 	   OrderBy      => \@OrderBy,
- 	   Rows         => $Rows,
- 	   Page         => $Page,
- 	   AllowSorting => $AllowSorting, 
- 	   BaseURL      => $BaseURL,
- 	   GenericQueryArgs => $GenericQueryArgs,
- 	   maxitems     => $maxitems,
- 	   PassArguments => \@PassArguments,
- 	   );
 -           %ARGS,
 -           Class        => $Class,
 -           Format       => \@Format,
 -           FormatString => $Format,
 -           Order        => \@Order,
 -           OrderBy      => \@OrderBy,
 -           Rows         => $Rows,
 -           Page         => $Page,
 -           AllowSorting => $AllowSorting, 
 -           BaseURL      => $BaseURL,
 -           GenericQueryArgs => $GenericQueryArgs,
 -           maxitems     => $maxitems,
 -       );
++    $m->comp('/Elements/CollectionAsTable/Header',
++        %ARGS,
++        Class        => $Class,
++        Format       => \@Format,
++        FormatString => $Format,
++        Order        => \@Order,
++        OrderBy      => \@OrderBy,
++        Rows         => $Rows,
++        Page         => $Page,
++        AllowSorting => $AllowSorting,
++        BaseURL      => $BaseURL,
++        GenericQueryArgs => $GenericQueryArgs,
++        maxitems     => $maxitems,
++        PassArguments => \@PassArguments,
++    );
  }
  
  my ($i, $column_map) = (0, {});
diff --cc share/html/m/_elements/login
index 4f82a06,d3993ad..5fbdb9a
--- a/share/html/m/_elements/login
+++ b/share/html/m/_elements/login
@@@ -76,17 -104,18 +76,18 @@@
  
  <& /Elements/Submit, Label => loc('Login')&>
  
 -% foreach my $key (keys %ARGS) {
 -%     if (($key ne 'user') and ($key ne 'pass')) {
 -%         if (ref($ARGS{$key}) =~ /ARRAY/) {
 -%             foreach my $val (@{$ARGS{$key}}) {
 -<input type="hidden" class="hidden" name="<%$key %>" value="<% $val %>" />
 -%             }
 -%         } else {
 -<input type="hidden" class="hidden" name="<% $key %>" value="<% $ARGS{$key} %>" />
 -%         }
 -%     }
 -% }
 +<input type="hidden" name="next" value="<% $next %>" />
 +<input type="hidden" name="mobile" value="1" />
 +
 +<script type="text/javascript">
 +if (window.location.hash) {
 +    var form = (document.getElementsByName("login"))[0];
 +    if (form) {
 +        form.action = form.action + '#' + window.location.hash.replace(/^#/, '');
 +    }
 +}
 +</script>
+ </form>
  % }
  </&>
  </div><!-- #login-box -->

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


More information about the Rt-commit mailing list