portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From morci...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler JetspeedProfilerService.java
Date Mon, 09 Jun 2003 17:42:23 GMT
morciuch    2003/06/09 10:42:22

  Modified:    src/java/org/apache/jetspeed/modules/actions/portlets/security
                        UserRoleUpdateAction.java
               src/java/org/apache/jetspeed/services/profiler
                        JetspeedProfilerService.java
  Log:
  Use meta-info instead of role name in merge when creating title (see Bugzilla bug# 19169)
  
  Revision  Changes    Path
  1.9       +6 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserRoleUpdateAction.java
  
  Index: UserRoleUpdateAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserRoleUpdateAction.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- UserRoleUpdateAction.java	25 Mar 2003 16:22:06 -0000	1.8
  +++ UserRoleUpdateAction.java	9 Jun 2003 17:42:22 -0000	1.9
  @@ -345,8 +345,11 @@
               // Handle profile with no panes
               else
               {
  -                String title = org.apache.turbine.util.StringUtils.firstLetterCaps(roleProfile.getRoleName());
  -                rolePortlets.setTitle(title + " Home");
  +                if (rolePortlets.getTitle() == null)
  +                {
  +                    String title = org.apache.turbine.util.StringUtils.firstLetterCaps(roleProfile.getRoleName());
  +                    rolePortlets.setTitle(title + " Home");
  +                }
                   rolePortlets.setLayout(null);
                   userPortlets.addPortlets(rolePortlets);
               }
  
  
  
  1.50      +6 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
  
  Index: JetspeedProfilerService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- JetspeedProfilerService.java	7 May 2003 15:16:52 -0000	1.49
  +++ JetspeedProfilerService.java	9 Jun 2003 17:42:22 -0000	1.50
  @@ -396,8 +396,11 @@
                       // Otherwise, add the contents of profile as a pane
                       else
                       {
  -                        String title = org.apache.turbine.util.StringUtils.firstLetterCaps(roleProfile.getRoleName());
  -                        tmpPortlets.setTitle(title + " Home");
  +                        if (tmpPortlets.getTitle() == null)
  +                        {
  +                            String title = org.apache.turbine.util.StringUtils.firstLetterCaps(roleProfile.getRoleName());
  +                            tmpPortlets.setTitle(title + " Home");
  +                        }
                           tmpPortlets.setLayout(null);
                           portlets.addPortlets(tmpPortlets);
                           paneCount++;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message