portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/parameters RegistryEntryListBox.java
Date Fri, 11 Apr 2003 15:30:41 GMT
weaver      2003/04/11 08:30:41

  Modified:    src/java/org/apache/jetspeed/modules/localization
                        JetspeedLocalization_en.properties
               webapp/WEB-INF/templates/vm/portlets/html
                        customizer-portlet.vm
               src/java/org/apache/jetspeed/modules/parameters
                        RegistryEntryListBox.java
  Log:
  This is in reference to bug #18885 where the issue is that the default 
  security assigned to portlets when added through the customizer may
  lessen the intended security of that portlet.
  
  Additional changes:
  
  Localized indicator messages for security source.
  
  JetspeedTool: added the getEntryFromRequest() method which, based on js_peid, will
  return the associated portlet profile entry.
  
  RegistryEntryListBox: changed so that the default security entry is blank
  instead of the system default.
  
  customizer-portlet.vm: added indicator messages for security source.
  
  multicolumn-customizer.vm: switched to using localized security source indicator messages.
  
  Revision  Changes    Path
  1.29      +3 -1      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties
  
  Index: JetspeedLocalization_en.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- JetspeedLocalization_en.properties	21 Jan 2003 21:33:57 -0000	1.28
  +++ JetspeedLocalization_en.properties	11 Apr 2003 15:30:40 -0000	1.29
  @@ -17,6 +17,8 @@
   
   SECURITY_NO_ACCESS=You do not have access to these portlets.
   SECURITY_NO_ACCESS_TO_PORTLET=You do not have access to this portlet.
  +SECURITY_IS_SYSTEM_DEFAULT=The security for this portlet is currently defined as system
default
  +SECURITY_IS_REGISTRY_LEVEL=The security for this portlet is currently defined at the registry
level
   
   PASSWORDREMINDER_EMAIL_HEADER=Hello
   PASSWORDREMINDER_EMAIL_BODY1=Your jetspeed account password is:
  
  
  
  1.15      +10 -4     jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portlet.vm
  
  Index: customizer-portlet.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portlet.vm,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- customizer-portlet.vm	5 Dec 2002 19:19:30 -0000	1.14
  +++ customizer-portlet.vm	11 Apr 2003 15:30:40 -0000	1.15
  @@ -2,6 +2,8 @@
   <br>
   #set ($config = $portlet.PortletConfig)
   #set ($mtype = $!data.Parameters.getString("mtype"))
  +#set($psmlEntry = $jetspeed.EntryFromRequest)
  +#set($securitySource = $jetspeed.getSecuritySource($psmlEntry))
   #if ($!mtype) 
     <form name="DefaultCustomizer" action="$jslink.Template.addQueryData('mtype', $mtype)"
method="post">
   #else
  @@ -42,14 +44,18 @@
       </tr>
   #end
   
  -#if ($security_ref) 
  +
  +
  +#if ($security_ref && $securitySource == 0) 
     #set ($securityRefListBox = $jetspeed.getPortletParameter($data, $customizer, "_security_ref",
$security_ref))
  -#else 
  -  #set ($securityRefListBox = $jetspeed.getPortletParameter($data, $customizer, "_security_ref"))

  +#else
  +  #set ($securityRefListBox = $jetspeed.getPortletParameter($data, $customizer, '_security_ref'))

   #end
   #if ($securityRefListBox)
       <tr>
  -      <td><b>$l10n.CUSTOMIZER_SECURITY_REF</b></td>
  +      <td><b>$l10n.CUSTOMIZER_SECURITY_REF 
  +     <span style="color:red">#if($securitySource == 1)$l10n.SECURITY_IS_REGISTRY_LEVEL#elseif($securitySource
== 2)$l10n.SECURITY_IS_SYSTEM_DEFAULT#end</span>
  +     </b></td>
         <td>$securityRefListBox</td>
       </tr>  
       <tr>
  
  
  
  1.5       +7 -7      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/parameters/RegistryEntryListBox.java
  
  Index: RegistryEntryListBox.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/parameters/RegistryEntryListBox.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RegistryEntryListBox.java	19 Feb 2003 17:39:45 -0000	1.4
  +++ RegistryEntryListBox.java	11 Apr 2003 15:30:40 -0000	1.5
  @@ -187,12 +187,12 @@
           else if (regName.equals(Registry.SECURITY))
           {
               label = Localization.getString("CUSTOMIZER_SECURITY_REF");
  -            SecurityReference defaultRef = PortalToolkit.getDefaultSecurityRef(
  -                ((JetspeedRunData) data).getCustomizedProfile());
  -            if (defaultRef != null)
  -            {
  -                defaultEntry = defaultRef.getParent();
  -            }
  +//            SecurityReference defaultRef = PortalToolkit.getDefaultSecurityRef(
  +//                ((JetspeedRunData) data).getCustomizedProfile());
  +//            if (defaultRef != null)
  +//            {
  +//                defaultEntry = defaultRef.getParent();
  +//            }
           }
           else if (regName.equals(Registry.MEDIA_TYPE))
           {
  
  
  

---------------------------------------------------------------------
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