[Fmsystem-commits] [14994]

[nelson . guerra]

Revision: 14994
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14994
Author:   nelson224
Date:     2016-05-11 00:24:15 +0000 (Wed, 11 May 2016)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php

Modified: 
branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php     
2016-05-11 00:23:39 UTC (rev 14993)
+++ branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php     
2016-05-11 00:24:15 UTC (rev 14994)
@@ -224,7 +224,7 @@
                                        'parameters' => json_encode($parameters)
                                );
                        }
-
+                       
                        self::render_template_xsl('datatable_jquery', $data);
                }
 
@@ -333,15 +333,11 @@
 
                                if (!$values)
                                {
-                                       $values = (array) 
$this->bo->read_single($id);                          
+                                       $values = (array) 
$this->bo->read_single($id);          
+                                       $values['report_date'] = 
($values['report_date']) ? date($this->dateFormat, $values['report_date']) : 
'';                       
                                }
                                $values['id'] = $id;
                        }
-
-                       if ($values['report_date'])
-                       {
-                               $values['report_date'] = 
date($this->dateFormat, $values['report_date']);
-                       }
                        
                        $categories = $this->_get_categories($values['cat_id']);
 
@@ -614,7 +610,7 @@
                        if ($file_name)
                        {
                                $to_file = $bofiles->fakebase . 
'/generic_document/' .$file_name;
-                               if ($bofiles->vfs->file_exists(array(
+                               /*if ($bofiles->vfs->file_exists(array(
                                                'string' => $to_file,
                                                'relatives' => 
array(RELATIVE_NONE)
                                        )))
@@ -623,7 +619,7 @@
                                        throw new Exception('This file already 
exists !');
                                }
                                else
-                               {
+                               {*/
                                        $receipt = 
$bofiles->create_document_dir("generic_document");
                                        if (count($receipt['error']))
                                        {
@@ -644,7 +640,7 @@
                                        } 
                                        
                                        return $file_id;
-                               }
+                               //}
                        } else {
                                return $id;
                        }
@@ -763,11 +759,12 @@
                        {
                                return 'No access';
                        }
+
                        $id = phpgw::get_var('id', 'int', 'GET');
 
                        try
                        {
-                               $this->bo->delete($id);
+                               $result = $this->bo->delete($id);
                        }
                        catch (Exception $e)
                        {
@@ -776,7 +773,7 @@
                                        return $e->getMessage();
                                }
                        }
-                       return 'Deleted';
+                       return $result;
                }
 
                        /*