[Fmsystem-commits] [8398]

[Erik Holm-Larsen]

Revision: 8398
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8398
Author:   erikhl
Date:     2011-12-21 06:47:05 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------


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

Modified: trunk/controller/inc/class.uidocument.inc.php
===================================================================
--- trunk/controller/inc/class.uidocument.inc.php       2011-12-20 13:21:44 UTC 
(rev 8397)
+++ trunk/controller/inc/class.uidocument.inc.php       2011-12-21 06:47:05 UTC 
(rev 8398)
@@ -183,7 +183,11 @@
                                
$document->set_title(phpgw::get_var('document_title'));
                                
$document->set_name($_FILES["file_path"]["name"]);
                                
$document->set_type_id(phpgw::get_var('document_type'));
+                               $desc = 
phpgw::get_var('document_description','html');
+                               var_dump($desc);
+                               $document->set_description($desc);
                                $document->set_procedure_id($procedure_id);
+                               //var_dump($document);
                                
                                //Retrieve the document properties
                                $document_properties = 
$this->get_type_and_id($document);
@@ -230,26 +234,26 @@
                {
                        $document_id = intval(phpgw::get_var('id'));
                        $document = $this->so->get_single($document_id);
-                       if($document->has_permission(PHPGW_ACL_READ))
-                       {
+//                     if($document->has_permission(PHPGW_ACL_READ))
+//                     {
                                $document_properties = 
$this->get_type_and_id($document);
                                
                                header("Content-Disposition: attachment; 
filename={$document->get_name()}");
                                header("Content-Type: $file_type");
                                header("Cache-Control: must-revalidate, 
post-check=0, pre-check=0");
                                
-                               echo 
rental_sodocument::get_instance()->read_document_from_vfs
+                               echo $this->so->read_document_from_vfs
                                (
                                        $document_properties['document_type'],  
                                        $document_properties['id'],
                                        $document->get_name()
                                );
-                       }
+/*                     }
                        else
                        {
                                $this->redirect($document, 
$document_properties, lang('no_access'), '');
                        }
-                       exit;
+                       exit;*/
                }
                
                /**
@@ -391,6 +395,7 @@
                                //$document_array[] = array('document' => 
$document->toArray());
                                $table_header[] = array('header' => 
lang('Document title'));
                                $table_header[] = array('header' => 
lang('Document name'));
+                               $table_header[] = array('header' => 
lang('Document description'));
                                
                                foreach($documents as $document)
                                {
@@ -421,6 +426,8 @@
                                        'values'                                
=> $table_values,
                                        'table_header'                  => 
$table_header,
                                );
+                               
+                               
$this->use_yui_editor(array('document_description'));
 
                                $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('controller') . '::' . lang('Procedure');
 

Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang        2011-12-20 13:21:44 UTC (rev 
8397)
+++ trunk/controller/setup/phpgw_no.lang        2011-12-21 06:47:05 UTC (rev 
8398)
@@ -306,5 +306,6 @@
 GUID   controller      no      GUID
 View_procedure controller      Prosedyre
 View_documents_for_procedure   controller      no      Tilknyttede dokumenter
-Document title controller      no      Dokumentets tittel:
-Document name  controller      no      Filnavn:
\ No newline at end of file
+Document title controller      no      Dokumentets tittel
+Document name  controller      no      Filnavn
+Document description   controller      no      Beskrivelse
\ No newline at end of file

Modified: trunk/controller/templates/base/procedure_documents.xsl
===================================================================
--- trunk/controller/templates/base/procedure_documents.xsl     2011-12-20 
13:21:44 UTC (rev 8397)
+++ trunk/controller/templates/base/procedure_documents.xsl     2011-12-21 
06:47:05 UTC (rev 8398)
@@ -15,7 +15,9 @@
                                        <h3><xsl:value-of 
select="php:function('lang','upload')" /></h3>
                                        <input type="file" id="file_path" 
name="file_path" />
                                        <xsl:value-of 
select="php:function('lang','title')" />:
-                                       <input type="text" id="document_title" 
name="document_title" />
+                                       <input type="text" id="document_title" 
name="document_title" /><br/>
+                                       <xsl:value-of 
select="php:function('lang','description')" />:
+                                       <textarea id="document_description" 
name="document_description" rows="5" cols="60"></textarea>
                                        <input type="submit" id="upload_button" 
value="{$lang_upload}" />
                                </fieldset>
                        </form>
@@ -50,6 +52,9 @@
                                <td align="left" style="padding-right: 10px;">
                                        <xsl:value-of select="name"/>
                                </td>
+                               <td align="left" style="padding-right: 10px;">
+                                       <xsl:value-of select="description" 
disable-output-escaping="yes"/>
+                               </td>
                        </xsl:for-each>
                </tr>
        </xsl:for-each>