[Fmsystem-commits] [15742]

[nelson . guerra]

Revision: 15742
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15742
Author:   nelson224
Date:     2016-09-28 00:12:12 +0000 (Wed, 28 Sep 2016)
Log Message:
-----------


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

Modified: 
branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php    
2016-09-28 00:11:53 UTC (rev 15741)
+++ branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php    
2016-09-28 00:12:12 UTC (rev 15742)
@@ -468,9 +468,16 @@
                                } else {
                                        $new_entity_categories = 
$receipt['new_entity_categories'];
                                }
+                       }                       
+                       
+                       $result = array();
+                       
+                       if (!count($import_data))
+                       {
+                               $result['error'][] = array('msg' => lang('not 
exist components to import'));
+                               return $result;
                        }
                        
-                       $result = array();
                        $preview_components = 
$import_components->prepare_preview_components($import_data);
 
                        $config = createObject('phpgwapi.config', 
'component_import');
@@ -526,6 +533,16 @@
                                return;
                        }
 
+                       $config = createObject('phpgwapi.config', 
'component_import');
+                       $config_repository = $config->read_repository();
+                       $import_data = $config_repository['new_components'];
+                       
+                       if (!count($import_data))
+                       {
+                               $this->receipt['error'][] = array('msg' => 
lang("not exist components to import"));
+                               return;
+                       }
+                       
                        $building_part_processed = 
$import_entity_categories->add_entity_categories();
                        if (count($building_part_processed['not_added']))
                        {
@@ -535,10 +552,6 @@
                                }
                        }
 
-                       $config = createObject('phpgwapi.config', 
'component_import');
-                       $config_repository = $config->read_repository();
-                       $import_data = $config_repository['new_components'];
-
                        if (count($building_part_processed['added']))
                        {
                                foreach($building_part_processed['added'] as $k 
=> $v)