[Checkins] SVN: Products.PluggableAuthService/branches/shh-15-masquerading/ Merged revisions 100512 via svnmerge from

[Andreas Zeidler]

Log message for revision 102136:
  Merged revisions 100512 via svnmerge from 
  svn+ssh://svn.zope.org/repos/main/Products.PluggableAuthService/branches/1.5
  
  ........
    r100512 | malthe | 2009-05-28 15:56:44 +0200 (Thu, 28 May 2009) | 1 line
    
    Fixed broken markup.
  ........
  

Changed:
  _U  Products.PluggableAuthService/branches/shh-15-masquerading/
  U   Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/doc/CHANGES.txt
  U   Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/plugins/www/zrRoles.zpt

-=-

Property changes on: Products.PluggableAuthService/branches/shh-15-masquerading
___________________________________________________________________
Modified: svnmerge-integrated
   - /Products.PluggableAuthService/branches/1.5:1-97440
   + /Products.PluggableAuthService/branches/1.5:1-102135

Modified: Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/doc/CHANGES.txt
===================================================================
--- Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/doc/CHANGES.txt	2009-07-23 12:14:22 UTC (rev 102135)
+++ Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/doc/CHANGES.txt	2009-07-23 12:15:37 UTC (rev 102136)
@@ -4,6 +4,8 @@
 PluggableAuthService 1.5.5 (unreleased)
 ---------------------------------------
 
+- Fixed broken markup.
+
 - Don't fail on users defined in multiple user sources on the ZODBGroupManager
   listing page.
 

Modified: Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/plugins/www/zrRoles.zpt
===================================================================
--- Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/plugins/www/zrRoles.zpt	2009-07-23 12:14:22 UTC (rev 102135)
+++ Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/plugins/www/zrRoles.zpt	2009-07-23 12:15:37 UTC (rev 102136)
@@ -47,8 +47,8 @@
   <td class="form-text" width="25%"
       tal:content="info/description">ROLE DESCRIPTION</td>
   <td class="form-text" width="50%">
-    <a href="?role_id=foo&assign=1"
-       tal:attributes="href string:?role_id=${info/id}&assign=1"
+    <a href="?role_id=foo&amp;assign=1"
+       tal:attributes="href string:?role_id=${info/id}&amp;assign=1"
     >?</a>
     <span
        tal:content="python:','.join( 
@@ -134,9 +134,9 @@
                 "
 >
 <h3> Update Role: <span tal:replace="role_id">ROLE_ID</span>
-     <a href="manage_roles?role_id=role_id&assign=1"
+     <a href="manage_roles?role_id=role_id&amp;assign=1"
         tal:define="url here/absolute_url;
-                    qs string:role_id=${role_id}&assign=1;
+                    qs string:role_id=${role_id}&amp;assign=1;
                    "
         tal:attributes="href string:${url}/manage_roles?${qs}"
      >(Assign)</a>