[Rt-commit] rt branch, master, updated. rt-4.1.5-65-gffc9a3b

[Kevin Falcone]

The branch, master has been updated
       via  ffc9a3b67838044f4aa7595e65dc54953b51203a (commit)
       via  87afda59229a127ae090071429a7d75aa6ece89d (commit)
      from  c0f2d012aa4eeee01abbb3bc9944d31c12facdc1 (commit)

Summary of changes:
 .../Memberships.html => Elements/MembershipsPage}  | 35 ++++++---
 .../Results.rdf => Admin/Groups/Memberships.html}  |  2 +-
 share/html/Admin/Users/Memberships.html            | 90 +---------------------
 share/html/Elements/Tabs                           |  1 +
 4 files changed, 28 insertions(+), 100 deletions(-)
 copy share/html/Admin/{Users/Memberships.html => Elements/MembershipsPage} (81%)
 copy share/html/{Search/Results.rdf => Admin/Groups/Memberships.html} (97%)

- Log -----------------------------------------------------------------
commit ffc9a3b67838044f4aa7595e65dc54953b51203a
Merge: c0f2d01 87afda5
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Dec 18 16:10:09 2012 -0500

    Merge branch '4.2/memberships-page-for-groups'
    
    Conflicts:
    	share/html/Elements/Tabs

diff --cc share/html/Admin/Groups/Memberships.html
index 0000000,dab15c7..05cae21
mode 000000,100644..100644
--- a/share/html/Admin/Groups/Memberships.html
+++ b/share/html/Admin/Groups/Memberships.html
@@@ -1,0 -1,1 +1,48 @@@
++%# BEGIN BPS TAGGED BLOCK {{{
++%#
++%# COPYRIGHT:
++%#
++%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
++%#                                          <sales at bestpractical.com>
++%#
++%# (Except where explicitly superseded by other copyright notices)
++%#
++%#
++%# LICENSE:
++%#
++%# This work is made available to you under the terms of Version 2 of
++%# the GNU General Public License. A copy of that license should have
++%# been provided with this software, but in any event can be snarfed
++%# from www.gnu.org.
++%#
++%# This work is distributed in the hope that it will be useful, but
++%# WITHOUT ANY WARRANTY; without even the implied warranty of
++%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++%# General Public License for more details.
++%#
++%# You should have received a copy of the GNU General Public License
++%# along with this program; if not, write to the Free Software
++%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++%# 02110-1301 or visit their web page on the internet at
++%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
++%#
++%#
++%# CONTRIBUTION SUBMISSION POLICY:
++%#
++%# (The following paragraph is not intended to limit the rights granted
++%# to you to modify and distribute this software under the terms of
++%# the GNU General Public License and is only of importance to you if
++%# you choose to contribute your changes and enhancements to the
++%# community by submitting them to Best Practical Solutions, LLC.)
++%#
++%# By intentionally submitting any modifications, corrections or
++%# derivatives to this work, or any other work intended for use with
++%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
++%# you are the copyright holder for those contributions and you grant
++%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
++%# royalty-free, perpetual, license to use, copy, create derivative
++%# works based on those contributions, and sublicense and distribute
++%# those contributions and any derivatives thereof.
++%#
++%# END BPS TAGGED BLOCK }}}
+ <& /Admin/Elements/MembershipsPage, %ARGS &>
diff --cc share/html/Elements/Tabs
index 4624095,9d41b86..feadea7
mode 100644,100755..100644
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@@ -341,14 -326,13 +341,15 @@@ my $build_admin_menu = sub 
              my $obj = RT::Group->new( $session{'CurrentUser'} );
              $obj->Load($id);
  
 -            my $tabs = PageMenu();
 -            $tabs->child( basics         => title => loc('Basics'),       path => "/Admin/Groups/Modify.html?id=" . $obj->id );
 -            $tabs->child( members        => title => loc('Members'),      path => "/Admin/Groups/Members.html?id=" . $obj->id );
 -            $tabs->child( memberships    => title => loc('Memberships'),  path => "/Admin/Groups/Memberships.html?id=" . $obj->id );
 -            $tabs->child( 'group-rights' => title => loc('Group Rights'), path => "/Admin/Groups/GroupRights.html?id=" . $obj->id );
 -            $tabs->child( 'user-rights'  => title => loc('User Rights'),  path => "/Admin/Groups/UserRights.html?id=" . $obj->id );
 -            $tabs->child( history        => title => loc('History'),      path => "/Admin/Groups/History.html?id=" . $obj->id );
 +            if ( $obj and $obj->id ) {
 +                my $tabs = PageMenu();
 +                $tabs->child( basics         => title => loc('Basics'),       path => "/Admin/Groups/Modify.html?id=" . $obj->id );
 +                $tabs->child( members        => title => loc('Members'),      path => "/Admin/Groups/Members.html?id=" . $obj->id );
++                $tabs->child( memberships    => title => loc('Memberships'),  path => "/Admin/Groups/Memberships.html?id=" . $obj->id );
 +                $tabs->child( 'group-rights' => title => loc('Group Rights'), path => "/Admin/Groups/GroupRights.html?id=" . $obj->id );
 +                $tabs->child( 'user-rights'  => title => loc('User Rights'),  path => "/Admin/Groups/UserRights.html?id=" . $obj->id );
 +                $tabs->child( history        => title => loc('History'),      path => "/Admin/Groups/History.html?id=" . $obj->id );
 +            }
          }
      }
  

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