[Fmsystem-commits] [9662] Added method for deleting procedure documents

[Erik Holm-Larsen]

Revision: 9662
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9662
Author:   erikhl
Date:     2012-06-26 10:25:14 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
Added method for deleting procedure documents

Modified Paths:
--------------
    trunk/controller/inc/class.uidocument.inc.php
    trunk/controller/templates/base/procedure/procedure_documents.xsl

Modified: trunk/controller/inc/class.uidocument.inc.php
===================================================================
--- trunk/controller/inc/class.uidocument.inc.php       2012-06-26 08:26:06 UTC 
(rev 9661)
+++ trunk/controller/inc/class.uidocument.inc.php       2012-06-26 10:25:14 UTC 
(rev 9662)
@@ -289,15 +289,19 @@
         {      
             $document_id = intval(phpgw::get_var('id'));
             $document = $this->so->get_single($document_id);
+            
+            $procedure_id = intval(phpgw::get_var('procedure_id'));
+            $procedure = $this->so_procedure->get_single($procedure_id);
+
             $document_properties = $this->get_type_and_id($document);
             
-            if(!$this->check_permissions($document,$document_properties))
+            /*if(!$this->check_permissions($document,$document_properties))
             {
                 $this->render('permission_denied.php');
                 return;
-            }
+            }*/
             
-            $result = 
rental_sodocument::get_instance()->delete_document_from_vfs
+            $result = $this->so->delete_document_from_vfs
             (
                 $document_properties['document_type'], 
                 $document_properties['id'],
@@ -306,7 +310,10 @@
             
             if($result)
             {
-                return $this->so->delete_document($document_id);
+                $this->so->delete_document($document_id);
+                $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'controller.uidocument.show', 
+                                                                               
                                        'procedure_id' => $procedure->get_id(), 
+                                                                               
                                        'tab' => 'documents'));
             } 
             // TODO: communicate error/message to user
             return false;
@@ -429,6 +436,8 @@
                     $doc_array = $document->toArray();
                     $doc_array['link'] = self::link(array('menuaction' => 
'controller.uidocument.view', 
                                                                                
        'id' => $doc_array['id']));
+                    $doc_array['delete_link'] = self::link(array('menuaction' 
=> 'controller.uidocument.delete', 
+                                                                               
        'id' => $doc_array['id'], 'procedure_id' => $procedure_id));
                     $table_values[] = array('document' => $doc_array);
                 }
                 

Modified: trunk/controller/templates/base/procedure/procedure_documents.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_documents.xsl   
2012-06-26 08:26:06 UTC (rev 9661)
+++ trunk/controller/templates/base/procedure/procedure_documents.xsl   
2012-06-26 10:25:14 UTC (rev 9662)
@@ -32,13 +32,14 @@
 </xsl:template>
 
 <xsl:template name="table_header_documents">
-       <th>
+       <tr>
                <xsl:for-each select="table_header" >
-                       <td>
+                       <th>
                                <xsl:value-of select="header"/>
-                       </td>
+                       </th>
                </xsl:for-each>
-       </th>
+               <td>&nbsp;</td>
+       </tr>
 </xsl:template>
 
 <xsl:template name="values_documents">
@@ -46,6 +47,7 @@
                <tr>
                        <xsl:for-each select="document" >
                                <xsl:variable name="doc_link"><xsl:value-of 
select='link'/></xsl:variable>
+                               <xsl:variable 
name="delete_doc_link"><xsl:value-of select='delete_link'/></xsl:variable>
                                <td>
                                        <a href="{$doc_link}"><xsl:value-of 
select="title"/></a>
                                </td>
@@ -55,6 +57,9 @@
                                <td>
                                        <xsl:value-of select="description" 
disable-output-escaping="yes"/>
                                </td>
+                               <td>
+                                       <a href="{$delete_doc_link}">Fjern 
dokument</a>
+                               </td>
                        </xsl:for-each>
                </tr>
        </xsl:for-each>