bug add and join instance

omatech · Nov 22, 2019 · 2cb54f3 · 2cb54f3
1 parent fb6282e
commit 2cb54f3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/admin/Helper/EditoraHelper.php b/src/admin/Helper/EditoraHelper.php
@@ -86,21 +86,25 @@ function _activeDate($date_init, $date_end = null)
 
 }
 
-if (!function_exists('_getFileSize')) {
+if (!function_exists('_getLocalFileSize')) {
     function _getLocalFileSize($file)
     {
         if(file_exists($file)){
             return filesize($file);
         }
         return 0;
     }
+}
+
+if (!function_exists('_getRemoteFileSize')) {
     function _getRemoteFileSize($file)
     {
         $head = array_change_key_case(get_headers($file, 1));
         $size = isset($head['content-length']) ? $head['content-length'] : 0;
         return $size;
     }
-
+}
+if (!function_exists('_getFileSize')) {
     function _getFileSize($file)
     {
         $size = 0;

diff --git a/src/admin/accions/admin_new_instance2.php b/src/admin/accions/admin_new_instance2.php
@@ -85,17 +85,25 @@ public function render()
                         'p_mode' => 'V',
                         'p_acces_type' => 'A'
                     );
+
                     $instance = $at->getInstanceAttributes($p_mode, $params_redirect);
                     $parents=$ly_t->paintParentsList($instances->getParents($params_redirect), $params_redirect);
+                    $redirect_class_id = $params_redirect['param1'];
+                    $redirect_inst_id = $params_redirect['param2'];
                 } else {// No vengo del relacionar
                     $params['param2'] = $res;
                     $instance = $at->getInstanceAttributes($p_mode, $params);
                     $parents=$ly_t->paintParentsList($instances->getParents($params), $params);
+                    $redirect_class_id = $params['param1'];
+                    $redirect_inst_id = $params['param2'];
                 }
-                $inst_id=$params['param2'];
+                $class_id = $params['param1'];
+                $inst_id = $params['param2'];
                 $instances->instance_update_date_and_backup($inst_id);
                 $_REQUEST['view']='container';
+                return redirect(route('editora.action', 'view_instance?p_pagina=1&p_class_id='.$redirect_class_id.'&p_inst_id='. $redirect_inst_id));
             }
+
         }
         $instance['instance_info']['class_id']=$params['param1'];
         $viewData = array_merge($menu, [

diff --git a/src/admin/views/templates/parents_menu.blade.php b/src/admin/views/templates/parents_menu.blade.php
@@ -1,4 +1,4 @@
-@if(isset($parents) && !empty($parents))
+@if(isset($parents) && !empty($parents) && is_array($parents))
 <div id="relations-menu">
     <header class="side-menu-header">
         <span class="tit">{{getMessage('container_objetos_padre')}}</span>