[Rt-commit] rt branch, 4.0/menu-cleanup, updated. rt-4.0.4-130-gdafef11

[Alex Vandiver]

The branch, 4.0/menu-cleanup has been updated
       via  dafef110025e5b43f7c1bd0f492893ae700695cc (commit)
       via  91744eda7535b0489b7d302b5b6b69f5036d355c (commit)
       via  5814796c0661c4dd0310b003ef6062a55a866dca (commit)
       via  a2d30b4216da4e875b121fc14045d18cb2031e71 (commit)
       via  1241691ed4c3681e38422f14f7df89ca04937670 (commit)
       via  2dd79622a117a9662ee7d63834b720b54447de89 (commit)
       via  b822fe352ab56c6166657c98773abd2b85991f3d (commit)
       via  4f3fc78fe7cd3a2d465c52600dd04583acb015ff (commit)
       via  eb04675af9b9e713fc285c732994eaf9bee0130e (commit)
       via  a7f6eb4284a50f7ba4419a63ca752f0fafb1ee8f (commit)
       via  198efb029da28582431a952b224ad45e4e8efd5c (commit)
       via  b021c8a6668d52f1edd871b2b917449572910878 (commit)
       via  b8be666660ea3ef80747dbf219897872b953a7a3 (commit)
       via  9851f0a84c13796a88322559276498a8e8cd71ec (commit)
       via  0f216920bafe88e919d893bbb7eafbf3bc32890a (commit)
       via  d8024dc69f0470a3b9d3dc6aa4d18f2c5318811d (commit)
       via  b8a4a896b4edfa83fb1a5e218172e9f7927e5b48 (commit)
       via  0d3ad45c2611344e2ade8927f88703b08646cb4f (commit)
       via  6ab4af02fee6c327b4dd9b6bb6809a5aee6490ef (commit)
       via  7a161371f809d270bbc81ae8bd0cd57296cbb764 (commit)
       via  aebc304f73f79002d7ede6ed09f2cbbc546a823b (commit)
       via  504f7f24385ccdd3f9549129f4520e07ff625401 (commit)
       via  75a405b58c89a703957da022796671a2201b05c6 (commit)
       via  3b7eea4f61ac47ace156fd724e3f61cc27560a22 (commit)
       via  357e98816d1e2c0c41e2d9667e8c702417dc37f8 (commit)
       via  6e07a0b97db8ae092e146a71c78cda84c90ea2f5 (commit)
       via  b9d6ba131fc2b329940214be91a3218c97b8b767 (commit)
       via  646befea128b612355a629d360c520a08c3e3814 (commit)
       via  967ed40c62c2a1d1800db35c986cb5671975a29c (commit)
       via  32b57018bdc5330d7fcb450deddb4f6227d16e2f (commit)
       via  c8783479f7296df43dac6dbeb248c85f62bd960d (commit)
       via  e510687db67f8daaa5172f017e56d3a888247cda (commit)
       via  d0b32c9de9b724d42f58eac7cb6b2fbfc59e8999 (commit)
       via  6290e01758bcfe908b1f77d13b88e6c9fe092da2 (commit)
       via  4419e37bcac2a874195fb4de1ae994e16a2ecda5 (commit)
       via  db3497168ebe34f72955545cf5344bf11198c751 (commit)
       via  7cd86e0e991d84a9bb7cab36bdd6f3e4c3c29da5 (commit)
       via  32410db102e6d074951476cf4a19ae529a7e5ef6 (commit)
       via  89a4fe7245212d9850e3a5263640c9d190179f70 (commit)
       via  e620b6d18e67e58e06d5e10a2a27411d51f5519b (commit)
       via  ca11550c4e2d8125d4c1c29dc734a1edc1445ca6 (commit)
       via  6b0ce674c5ec51fd615f5125f063dfb3eba6661f (commit)
       via  8625fed37840aa7c9e577b2f761d8c7f4c3baedc (commit)
       via  da90158e41e91573715731fd04b3595486adb843 (commit)
       via  cf6d7c05d536e56e991fbe9f86f2ba2167e10f7b (commit)
       via  5b92928923ceefbdf63a974254eabb6d38b6a41e (commit)
       via  a8f48997534eba5509c57fabc884f62e1118ed29 (commit)
       via  d815ce80161efbde2e76a9448ae721ed7e8b4fdb (commit)
       via  60e8ff715195d452c9914b11cd66554594148a89 (commit)
       via  bb4db08d9b186cfa28a90665cd0777e14776cf0e (commit)
       via  7ad260abf441ad821b1e55a2189b999c97ce134a (commit)
       via  f05cec5a272d1f08cfc3335ae4713c154db5d0d7 (commit)
       via  bba9375660e80662a69e5cc8d56be51f2f617a6b (commit)
       via  f1e539a275b3d9223190ac69e83fbb9b9b1a7c6f (commit)
       via  de3e8d5cb267053b9dbd771f5f51aad7958b0c13 (commit)
       via  7262d8e459cdcc18a7767db70b3d6b7cbd9ce1f2 (commit)
      from  6f2a1b02a3d2fcae0b8785a1bac455e09def6c8d (commit)

Summary of changes:
 Makefile.in                                     |   14 ++-
 docs/schema.dot                                 |   99 +++++++++++++++
 etc/RT_Config.pm.in                             |   13 ++
 lib/RT/Action/CreateTickets.pm                  |   24 ++++-
 lib/RT/Class.pm                                 |    6 +-
 lib/RT/Interface/Web/Handler.pm                 |    1 -
 lib/RT/Search/Googleish.pm                      |    6 +-
 lib/RT/Test/Web.pm                              |   27 ++++
 sbin/rt-clean-sessions.in                       |    3 +-
 sbin/rt-setup-database.in                       |   60 +++++-----
 sbin/rt-test-dependencies.in                    |    1 -
 share/html/Elements/CollectionAsTable/Row       |    3 +-
 share/html/Elements/EditCustomFieldAutocomplete |    2 +-
 share/html/Elements/Tabs                        |    7 +
 share/html/NoAuth/css/print.css                 |  146 ++++++++++++++++++++--
 share/html/Search/Chart                         |    5 +-
 share/html/Search/Simple.html                   |   29 +++--
 share/html/Ticket/Display.html                  |    3 +-
 share/html/Ticket/Elements/ClickToShowHistory   |    3 +-
 share/html/Widgets/Form/Integer                 |    9 +-
 t/lifecycles/basics.t                           |   86 ++++++-------
 t/lifecycles/unresolved-deps.t                  |   45 +++++++
 t/ticket/googleish_search.t                     |    4 +-
 t/web/offline.t                                 |   78 ++++++++++++
 24 files changed, 549 insertions(+), 125 deletions(-)
 create mode 100755 docs/schema.dot
 create mode 100644 t/lifecycles/unresolved-deps.t
 create mode 100644 t/web/offline.t

- Log -----------------------------------------------------------------
commit dafef110025e5b43f7c1bd0f492893ae700695cc
Merge: 6f2a1b0 91744ed
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Dec 12 13:57:33 2011 -0500

    Merge branch '4.0-trunk' into 4.0/menu-cleanup
    
    Conflicts:
    	share/html/Elements/Tabs

diff --cc share/html/Elements/Tabs
index c428dcb,0f65c5b..953e938
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@@ -560,9 -496,12 +560,12 @@@ my $build_main_nav = sub 
              }
  
              if ( $can->('ForwardMessage') ) {
 -                $actions->child( forward => title => loc('Forward'), path => "/Ticket/Forward.html?id=" . $id, );
 +                $actions->child( forward => title => loc('Forward'), path => "/Ticket/Forward.html?id=" . $id );
              }
  
+             my $hide_resolve_with_deps = RT->Config->Get('HideResolveActionsWithDependencies')
+                 && $obj->HasUnresolvedDependencies;
+ 
              my $current   = $obj->Status;
              my $lifecycle = $obj->QueueObj->Lifecycle;
              my $i         = 1;
@@@ -573,24 -512,25 +576,28 @@@
                  my $check = $lifecycle->CheckRight( $current => $next );
                  next unless $can->($check);
  
+                 next if $hide_resolve_with_deps
+                     && $lifecycle->IsInactive($next)
+                     && !$lifecycle->IsInactive($current);
+ 
                  my $action = $info->{'update'} || '';
 -
 -
                  my $url = '/Ticket/';
                  if ($action) {
 -
 -                    $url .= "Update.html?" . $query_string->(Action => $action,
 -                                           DefaultStatus => $next,
 -                                           id            => $id
 -                                         );
 +                    $url .= "Update.html?"
 +                        . $query_string->(
 +                            Action        => $action,
 +                            DefaultStatus => $next,
 +                            id            => $id,
 +                        );
                  } else {
 -                    $url .= "Display.html?" . $query_string->( Status => $next, id => $id );
 +                    $url .= "Display.html?"
 +                        . $query_string->(
 +                            Status => $next,
 +                            id     => $id,
 +                        );
                  }
                  my $key = $info->{'label'} || ucfirst($next);
 -                $actions->child( $key => title => loc( $key ) => path => $url);
 +                $actions->child( $key => title => loc( $key ), path => $url);
              }
  
              if ( $can->('OwnTicket') ) {

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