special_classes in config and bug attribute image

omatech · Aug 13, 2019 · e310e82 · e310e82
1 parent 5b5d320
commit e310e82
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 22 deletions.
diff --git a/src/admin/conf/ompinfo.php b/src/admin/conf/ompinfo.php
@@ -35,12 +35,20 @@
     y en el menú no queremos que aparezca la opción de crar nuevo ni lista,
     simplemente irá a la instancia
 */
-    $GLOBALS['special_classes'] = array(CLASSHOME=>HOMEID, CLASSGLOBAL=>GLOBALID);
+    $array_special_classes = config('editora.special_classes');
+    if(isset($array_special_classes) && !empty($array_special_classes)){
+        //[class_id=>instance_id]
+        $GLOBALS['special_classes'] = $array_special_classes;
+    }else{
+        $GLOBALS['special_classes'] = array(CLASSHOME=>HOMEID, CLASSGLOBAL=>GLOBALID);
+    }
+
 
     define("EDITORA_NAME", 'OMATECH');
     global $array_langs;
     $array_langs = config('editora.languages');
 
+
     //Flags
     define("INST_PERM", 1);
     define("USERINSTANCES", 300);

diff --git a/src/admin/views/attributes/I.blade.php b/src/admin/views/attributes/I.blade.php
@@ -163,6 +163,8 @@ function addedFile(file) {
                         ((attribH_{{$attribute_name}} != '' && attribH_{{$attribute_name}} != this.height) ||
                         (attribW_{{$attribute_name}} != '' && attribW_{{$attribute_name}} != this.width))) {
                         autoResizeImg(loadedImage);
+                    }else {
+                        dropzone_{{$attribute_name}}.processQueue();
                     }
                 }
             }

diff --git a/src/admin/views/templates/main_menu.blade.php b/src/admin/views/templates/main_menu.blade.php
@@ -16,27 +16,38 @@
                             <div class="collapse" id="subnav-{{$section['id']}}">
                                 <ul class="level-3-nav">
                                     @foreach($section['list'] as $item)
-                                        @if($item['id']==1){{--global--}}
-                                            <li>
-                                                <a href="{{ route('editora.action', 'view_instance/?p_pagina=1&p_class_id='.$item['id'].'&p_inst_id=2') }}" class="link-list">
-                                                    <span class="link-text">{{$item['lg_name']}}</span>
-                                                </a>
-                                            </li>
-                                        @elseif($item['id']==10){{--home--}}
-                                            <li>
-                                                <a href="{{ route('editora.action', 'view_instance/?p_pagina=1&p_class_id='.$item['id'].'&p_inst_id=1') }}" class="link-list">
-                                                    <span class="link-text">{{$item['lg_name']}}</span>
-                                                </a>
-                                            </li>
+
+                                        @if( empty( config('editora-admin.special_classes')) && $item['id']==1){{--global--}}
+                                        <li>
+                                            <a href="{{ route('editora.action', 'view_instance/?p_pagina=1&p_class_id='.$item['id'].'&p_inst_id=2') }}" class="link-list">
+                                                <span class="link-text">{{$item['lg_name']}}</span>
+                                            </a>
+                                        </li>
+                                        @elseif(  empty( config('editora-admin.special_classes')) && $item['id']==10){{--home--}}
+                                        <li>
+                                            <a href="{{ route('editora.action', 'view_instance/?p_pagina=1&p_class_id='.$item['id'].'&p_inst_id=1') }}" class="link-list">
+                                                <span class="link-text">{{$item['lg_name']}}</span>
+                                            </a>
+                                        </li>
                                         @else
-                                            <li>
-                                                <a href="{{ route('editora.action', 'list_instances/?p_class_id='.$item['id']) }}" class="link-list">
-                                                    <span class="link-text">{{$item['lg_name']}}</span>
-                                                </a>
-                                                <a href="{{ route('editora.action', 'new_instance/?p_class_id='.$item['id']) }}" class="link-new">
-                                                    <i class="icon-plus-box"></i>
-                                                </a>
-                                            </li>
+
+                                            @if( !empty( config('editora-admin.special_classes') ) && array_key_exists( $item['id'],config('editora-admin.special_classes') ) )
+                                                <li>
+                                                    <a href="{{ route('editora.action', 'view_instance/?p_pagina=1&p_class_id='.$item['id'].'&p_inst_id='.config('editora-admin.special_classes')[$item['id']]) }}" class="link-list">
+                                                        <span class="link-text">{{$item['lg_name']}}</span>
+                                                    </a>
+                                                </li>
+                                            @else
+                                                <li>
+                                                    <a href="{{ route('editora.action', 'list_instances/?p_class_id='.$item['id']) }}" class="link-list">
+                                                        <span class="link-text">{{$item['lg_name']}}</span>
+                                                    </a>
+                                                    <a href="{{ route('editora.action', 'new_instance/?p_class_id='.$item['id']) }}" class="link-new">
+                                                        <i class="icon-plus-box"></i>
+                                                    </a>
+                                                </li>
+                                            @endif
+
                                         @endif
                                     @endforeach
                                 </ul>

diff --git a/src/config/config.php b/src/config/config.php
@@ -11,5 +11,6 @@
     ],
     'uploads-storage' => 'public',
     'url-storage-relative' => true,
-    'curl-refresh-command' => ''
+    'curl-refresh-command' => '',
+    'special_classes' => []
 ];