[Zapp-cvs-commit] ZApp/zpt Generic_displayRelatedObjects.zpt,1.4,1.5

[<ssp...@us...>]

Update of /cvsroot/zapp/ZApp/zpt
In directory sc8-pr-cvs1:/tmp/cvs-serv28855/zpt

Modified Files:
	Generic_displayRelatedObjects.zpt 
Log Message:
attempt to merge new CMF relations back to main branch

Index: Generic_displayRelatedObjects.zpt
===================================================================
RCS file: /cvsroot/zapp/ZApp/zpt/Generic_displayRelatedObjects.zpt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Generic_displayRelatedObjects.zpt	7 Aug 2003 17:51:55 -0000	1.4
--- Generic_displayRelatedObjects.zpt	28 Oct 2003 20:27:04 -0000	1.5
***************
*** 1,4 ****
  <div tal:define="app python:here.findApplication(); appURL app/absolute_url; 
!                  objRelations python:here.objectRelations( returnObjects=1 )">
  <form action="" tal:attributes="action request/URL1" method="post">
  <table >
--- 1,5 ----
  <div tal:define="app python:here.findApplication(); appURL app/absolute_url; 
!                  objRelations python:here.objectRelations( returnObjects=1 );
!                  managerIDs here/findSpecialistsForRelationship">
  <form action="" tal:attributes="action request/URL1" method="post">
  <table >
***************
*** 18,22 ****
      <input tal:condition="objRelations" type="submit" value="Edit Selected Relations" name="editRelations_ui:method">
  </td></tr>
! <tr><td colspan="3"><input type="submit" value="Relate Other Object" name="findNewRelationship_pt:method">
                       </td></tr>
  </table>
--- 19,23 ----
      <input tal:condition="objRelations" type="submit" value="Edit Selected Relations" name="editRelations_ui:method">
  </td></tr>
! <tr tal:condition="managerIDs"><td colspan="3"><input type="submit" value="Relate Other Object" name="addRelationship_pt:method">
                       </td></tr>
  </table>