[Fmsystem-commits] [16006] docs

[sigurdne]

Revision: 16006
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16006
Author:   sigurdne
Date:     2016-11-18 14:44:56 +0000 (Fri, 18 Nov 2016)
Log Message:
-----------
docs

Modified Paths:
--------------
    trunk/property/inc/class.uientity.inc.php
    trunk/property/templates/base/entity.xsl

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2016-11-18 13:23:39 UTC (rev 
16005)
+++ trunk/property/inc/class.uientity.inc.php   2016-11-18 14:44:56 UTC (rev 
16006)
@@ -619,6 +619,7 @@
                        
                        $document = CreateObject('property.sodocument');
                        $documents = $document->read_at_location($params);
+                       $total_records = $document->total_records;
                
                        foreach ($documents as $item) 
                        {
@@ -636,6 +637,7 @@
                        $params['order'] = 'name';
                        $params['cat_id'] = $doc_type;
                        $documents2 = $generic_document->read($params);
+                       $total_records += $generic_document->total_records;
                        foreach ($documents2 as $item) 
                        {
                                $document_name = '<a 
href="'.self::link(array('menuaction'=>'property.uigeneric_document.view_file', 
'file_id'=>$item['id'])).'" target="_blank">'.$item['name'].'</a>';
@@ -644,7 +646,7 @@
                        
                        $result_data = array('results' => $values);
 
-                       $result_data['total_records'] = count($values);
+                       $result_data['total_records'] = $total_records;
                        $result_data['draw'] = $draw;
 
                        return $this->jquery_results($result_data);
@@ -2126,7 +2128,7 @@
                                        }
                                }
 
-                               if ($get_docs)
+                               if ($get_docs || 
!empty($entity['documentation']))
                                {
                                        $tabs['document'] = array('label' => 
lang('document'), 'link' => '#document', 'disable' => 0);
                                        

Modified: trunk/property/templates/base/entity.xsl
===================================================================
--- trunk/property/templates/base/entity.xsl    2016-11-18 13:23:39 UTC (rev 
16005)
+++ trunk/property/templates/base/entity.xsl    2016-11-18 14:44:56 UTC (rev 
16006)
@@ -725,7 +725,7 @@
                                                                        
</xsl:for-each>
                                                                </div>
                                                                <xsl:choose>
-                                                                       
<xsl:when test="cat_list='' and fileupload = 1 and mode = 'edit'">
+                                                                       
<xsl:when test="value_id!='' and fileupload = 1 and mode = 'edit'">
                                                                                
<xsl:call-template name="file_upload"/>
                                                                        
</xsl:when>
                                                                </xsl:choose>