Index: openacs-4/contrib/packages/room-reservation/www/reservation-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/room-reservation/www/reservation-view.adp,v
diff -u -r1.2.2.4 -r1.2.2.5
--- openacs-4/contrib/packages/room-reservation/www/reservation-view.adp	10 Jun 2005 22:44:24 -0000	1.2.2.4
+++ openacs-4/contrib/packages/room-reservation/www/reservation-view.adp	11 Jun 2005 00:04:27 -0000	1.2.2.5
@@ -4,16 +4,16 @@
   
   <p />
   <ul>
-    <if @owner_p@ true and @reservation_info.status@ eq "pending">
+    <if @owner_p@ true and @reservation_info.status@ eq "pending" or @write_p@ true>
       <li><a href="reservation-edit?reservation_id=@reservation_info.reservation_id@">#room-reservation.Edit#</a></li>
+      <if @reservation_info.status@ in "pending" "rejected" "approved">
       <li><a href="reservation-cancel?reservation_id=@reservation_info.reservation_id@">#room-reservation.Cancel#</a></li>
+      </if>
     </if>
 
     <if @write_p@ true>
-      <li><a href="reservation-edit?reservation_id=@reservation_info.reservation_id@">#room-reservation.Edit#</a></li>
-      <li><a href="reservation-cancel?reservation_id=@reservation_info.reservation_id@">#room-reservation.Cancel#</a></li>
-      <if @conflict_p@ false and @reservation_info.status@ in "pending" "rejected" >
-        <li><a href="moderate/reservation-approve?reservation_id=@reservation_info.reservation_id@">#room-reservation.Approve#</a></li>
+      <if @conflict_p@ false and @reservation_info.status@ in "pending" "rejected" "canceled" >
+        <li><a href="reservation-approve?reservation_id=@reservation_info.reservation_id@">#room-reservation.Approve#</a></li>
       </if>
       <if @reservation_info.status@ in "pending" "approved">
         <!--Not working: <li><a href="moderate/reservation-reject?reservation_id=@reservation_info.reservation_id@">#room-reservation.Reject#</a></li>-->