From a865109ec6d1585978f103113336fd20a7901d9b Mon Sep 17 00:00:00 2001
From: Madhavi Khatal <madhavikhatal@gmail.com>
Date: Tue, 6 Dec 2016 15:44:23 +0530
Subject: [PATCH] Bug fixes

---
 src/Helpers/LAHelper.php    | 7 +++++--
 src/Models/Module.php       | 2 +-
 src/Models/ModuleFields.php | 5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Helpers/LAHelper.php b/src/Helpers/LAHelper.php
index df38b3d2..3cf4703e 100644
--- a/src/Helpers/LAHelper.php
+++ b/src/Helpers/LAHelper.php
@@ -409,7 +409,7 @@ public static function print_menu_editor($menu)
     public static function print_menu($menu, $active = false)
     {
         $childrens = \Dwij\Laraadmin\Models\Menu::where("parent", $menu->id)->orderBy('hierarchy', 'asc')->get();
-        
+
         $treeview = "";
         $subviewSign = "";
         if(count($childrens)) {
@@ -426,7 +426,10 @@ public static function print_menu($menu, $active = false)
         if(count($childrens)) {
             $str .= '<ul class="treeview-menu">';
             foreach($childrens as $children) {
-                $str .= LAHelper::print_menu($children);
+                $module = Module::get($children->url);
+                if(Module::hasAccess($module->id)) {
+                    $str .= LAHelper::print_menu($children);
+                }
             }
             $str .= '</ul>';
         }
diff --git a/src/Models/Module.php b/src/Models/Module.php
index 973fbba6..c7092ea6 100644
--- a/src/Models/Module.php
+++ b/src/Models/Module.php
@@ -916,7 +916,7 @@ public static function get($module_name)
         if(is_int($module_name)) {
             $module = Module::find($module_name);
         } else {
-            $module = Module::where('name', $module_name)->first();
+            $module = Module::where('name', $module_name)->orWhere('name_db', $module_name)->first();
         }
         
         // If Module is found in database also attach its field array to it.
diff --git a/src/Models/ModuleFields.php b/src/Models/ModuleFields.php
index 215c22c9..91b33dfa 100644
--- a/src/Models/ModuleFields.php
+++ b/src/Models/ModuleFields.php
@@ -95,8 +95,7 @@ public static function createField($request)
                 }
             } else {
                 $field->popup_vals = "";
-            }
-            $field->save();
+            }          
 
             // Get number of Module fields
             $modulefields = ModuleFields::where('module', $module_id)->get();
@@ -126,6 +125,8 @@ public static function createField($request)
                 });
             }
         }
+        $field->save();
+        
         return $field->id;
     }