[Rt-commit] rt branch, 4.6/core-group-management-extensions, repushed

Blaine Motsinger blaine at bestpractical.com
Wed Jun 5 17:36:07 EDT 2019


The branch 4.6/core-group-management-extensions was deleted and repushed:
       was 720871575f58b20b9e15772ea691de827b3e4cb7
       now 8f235fbe61f6642ea8c625e347b3a4704d0dd65b

1: 5619366f5 ! 1: 0b7d978dd Core RT-Extension-GroupLinks
    @@ -23,14 +23,18 @@
                      $page->child( basics         => title => loc('Basics'),       path => "/Admin/Groups/Modify.html?id=" . $obj->id );
                      $page->child( members        => title => loc('Members'),      path => "/Admin/Groups/Members.html?id=" . $obj->id );
                      $page->child( memberships    => title => loc('Memberships'),  path => "/Admin/Groups/Memberships.html?id=" . $obj->id );
    -+                $page->child( 'links'        => title => loc("Links"),        path => "/Admin/Groups/ModifyLinks.html?id=" . $obj->id,
    -+                    description => loc("Group links"),
    ++                $page->child( 'links'     =>
    ++                              title       => loc("Links"),
    ++                              path        => "/Admin/Groups/ModifyLinks.html?id=" . $obj->id,
    ++                              description => loc("Group links"),
     +                );
                      $page->child( 'group-rights' => title => loc('Group Rights'), path => "/Admin/Groups/GroupRights.html?id=" . $obj->id );
                      $page->child( 'user-rights'  => title => loc('User Rights'),  path => "/Admin/Groups/UserRights.html?id=" . $obj->id );
                      $page->child( history        => title => loc('History'),      path => "/Admin/Groups/History.html?id=" . $obj->id );
    -+                $page->child( 'summary'      => title => loc("Group Summary"), path => "/Group/Summary.html?id=" . $obj->id,
    -+                    description => loc("Group summary page"),
    ++                $page->child( 'summary'   =>
    ++                              title       => loc("Group Summary"),
    ++                              path        => "/Group/Summary.html?id=" . $obj->id,
    ++                              description => loc("Group summary page"),
     +                );
                  }
              }
    @@ -228,7 +232,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
2: d9b9d1d97 ! 2: 805650645 Core RT-Extension-GroupSummary
    @@ -6,11 +6,18 @@
     --- a/etc/RT_Config.pm.in
     +++ b/etc/RT_Config.pm.in
     @@
    - 
    - Set( $SelfServiceDownloadUserData, 0 );
    - 
    -+=back
    -+
    + Set(
    +     $HomepageComponents,
    +     [
    +-        qw(QuickCreate QueueList MyAdminQueues MySupportQueues MyReminders RefreshHomepage Dashboards SavedSearches FindUser MyAssets FindAsset) # loc_qw
    ++        qw(QuickCreate QueueList MyAdminQueues MySupportQueues MyReminders RefreshHomepage Dashboards SavedSearches FindUser MyAssets FindAsset FindGroup) # loc_qw
    +     ]
    + );
    + 
    +@@
    + 
    + =back
    + 
     +=head2 Group Summary Configuration
     +
     +Below are configuration options for the Group Summary page.
    @@ -19,8 +26,8 @@
     +
     +=item C<$GroupSearchResultFormat>
     +
    -+This controls the display of lists of users returned from the User
    -+Summary Search. The display of users in the Admin interface is
    ++This controls the display of lists of groups returned from the Group
    ++Summary Search. The display of groups in the Admin interface is
     +controlled by C<%AdminSearchResultFormat>.
     +
     +=cut
    @@ -38,13 +45,12 @@
     +
     +=cut
     +
    -+#Set(@GroupSummaryPortlets, (qw/ExtraInfo CreateTicket ActiveTickets InactiveTickets UserAssets /));
     +Set(@GroupSummaryPortlets, (qw/ExtraInfo CreateTicket ActiveTickets InactiveTickets GroupAssets /));
     +
     +=item C<$GroupSummaryExtraInfo>
     +
     +This controls what information is displayed on the Group Summary
    -+portal. By default the group Name and Description are displayed
    ++portal. By default the group Name and Description are displayed.
     +
     +=cut
     +
    @@ -91,26 +97,29 @@
     +
     +=item C<$AllowGroupAutocompleteForUnprivileged>
     +
    -+Defines whether unprivileged users (users of SelfService) are allowed to
    -+autocomplete groups when searching. Setting this option to
    -+1 means unprivileged users will be able to search all your user created
    -+group names.
    ++Defines whether unprivileged users (users of SelfService) are allowed
    ++to autocomplete groups when searching. Setting this option to 1 means
    ++unprivileged users will be able to search all your user created
    ++group names. Users will also need the SeeGroup privilege to use 
    ++this feature.
     +
     +=cut
     +
     +Set($AllowGroupAutocompleteForUnprivileged, 0);
     +
    -+=item C<$HomepageComponents>
    -+
    -+C<$HomepageComponents> is an arrayref of allowed components on a
    -+user's customized homepage ("RT at a glance"). The GroupSummary extension
    -+provides a component called 'FindGroup' that you can add to your C<$HomepageComponents>
    -+in RT.
    -+
    -+=cut
    - 
    ++=back
    ++
    + =head2 Self Service Interface
    + 
    + The Self Service Interface is a view automatically presented to Unprivileged
    +@@
    + 
    + Set( $SelfServiceDownloadUserData, 0 );
    + 
    +-
      =back
      
    + =head2 Articles
     
     diff --git a/lib/RT/Groups.pm b/lib/RT/Groups.pm
     --- a/lib/RT/Groups.pm
    @@ -234,40 +243,24 @@
      
          $search->child( users => title => loc('Users'),   path => "/User/Search.html" );
      
    -+    $search->child( groups => title => loc('Groups'), path => "/Group/Search.html",
    -+        description => 'Group search' );
    ++    $search->child( groups      => 
    ++                    title       => loc('Groups'),
    ++                    path        => "/Group/Search.html",
    ++                    description => 'Group search'
    ++    );
     +
          $search->child( assets => title => loc("Assets"), path => "/Asset/Search/" )
              if $current_user->HasRight( Right => 'ShowAssetsMenu', Object => RT->System );
      
     @@
    -         }
    + 
          }
      
    -+    if ( $request_path =~ m{^/Group/(Summary|History)\.html} ) {
    -+        if ( $HTML::Mason::Commands::DECODED_ARGS->{'id'} && $HTML::Mason::Commands::DECODED_ARGS->{'id'} =~ /^\d+$/ ) {          
    -+            my $id = $HTML::Mason::Commands::DECODED_ARGS->{'id'};
    -+            my $obj = RT::Group->new( $current_user );
    -+            $obj->Load($id);
    -+
    -+            if ( $obj and $obj->id and $current_user->HasRight(Right => 'SeeGroup', Object => $obj)) {
    -+                $page->child( basics         => title => loc('Basics'),       path => "/Admin/Groups/Modify.html?id=" . $obj->id );
    -+                $page->child( members        => title => loc('Members'),      path => "/Admin/Groups/Members.html?id=" . $obj->id );
    -+                $page->child( memberships    => title => loc('Memberships'),  path => "/Admin/Groups/Memberships.html?id=" . $obj->id );
    -+                $page->child( 'links' => title => loc("Links") => description => loc("Group links") =>
    -+                    path => "/Admin/Groups/ModifyLinks.html?id=" . $obj->id);
    -+                $page->child( 'group-rights' => title => loc('Group Rights'), path => "/Admin/Groups/GroupRights.html?id=" . $obj->id );
    -+                $page->child( 'user-rights'  => title => loc('User Rights'),  path => "/Admin/Groups/UserRights.html?id=" . $obj->id );
    -+                $page->child( history        => title => loc('History'),      path => "/Admin/Groups/History.html?id=" . $obj->id );
    -+                $page->child( 'summary' => title => loc("Group Summary") => description => loc("Group summary page") =>
    -+                    path => "/Group/Summary.html?id=" . $obj->id);
    -+            }
    -+        }
    -+    }
    -+
    -     if ( $request_path =~ m{^/Admin/CustomFields/} ) {
    +-    if ( $request_path =~ m{^/Admin/Groups} ) {
    ++    if ( $request_path =~ m{^(/Admin/Groups|/Group/(Summary|History)\.html)} ) {
              if ( $HTML::Mason::Commands::DECODED_ARGS->{'id'} && $HTML::Mason::Commands::DECODED_ARGS->{'id'} =~ /^\d+$/ ) {
                  my $id = $HTML::Mason::Commands::DECODED_ARGS->{'id'};
    +             my $obj = RT::Group->new( $current_user );
     
     diff --git a/share/html/Elements/FindGroup b/share/html/Elements/FindGroup
     new file mode 100644
    @@ -278,7 +271,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
    @@ -334,7 +327,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
    @@ -402,7 +395,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
    @@ -488,7 +481,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
    @@ -558,7 +551,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
    @@ -632,7 +625,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
    @@ -696,7 +689,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
    @@ -758,7 +751,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
    @@ -816,7 +809,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
    @@ -890,7 +883,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
    @@ -1010,7 +1003,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
    @@ -1116,7 +1109,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
    @@ -1188,7 +1181,7 @@
     +my @results;
     +if ( $Group->Disabled ){
     +    if ( $session{'CurrentUser'}->HasRight(
    -+        Object => RT->System, Right => 'AdminUsers' ) ){
    ++        Object => RT->System, Right => 'AdminGroup' ) ){
     +        push @results, loc('Group [_1] is currently disabled. Edit the group and check "Enabled" to enable.', $Group->Name);
     +    }
     +    else{
3: c61bca7bb ! 3: f5ebdf2db Core RT-Extension-GroupSelfService
    @@ -31,7 +31,7 @@
     +
      =back
      
    - =head2 Group Summary Configuration
    + =head2 Articles
     
     diff --git a/etc/initialdata b/etc/initialdata
     --- a/etc/initialdata
4: 720871575 = 4: 8f235fbe6 Fix tests for initialdata change



More information about the rt-commit mailing list