Fix admin page default view and settings navlinks (#12)

daniel-lerch · Jul 23, 2020 · c5af1b7 · c5af1b7
1 parent 625791b
commit c5af1b7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/install/kOOL_db.sql b/install/kOOL_db.sql
@@ -1214,7 +1214,7 @@ INSERT INTO `ko_settings` VALUES('xls_default_font', '');
 INSERT INTO `ko_settings` VALUES('xls_title_font', '');
 INSERT INTO `ko_settings` VALUES('xls_title_bold', '1');
 INSERT INTO `ko_settings` VALUES('xls_title_color', 'blue');
-INSERT INTO `ko_settings` VALUES('default_view_admin', 'set_layout');
+INSERT INTO `ko_settings` VALUES('default_view_admin', 'admin_settings');
 INSERT INTO `ko_settings` VALUES('default_view_daten', 'show_cal_monat');
 INSERT INTO `ko_settings` VALUES('default_view_leute', 'show_all');
 INSERT INTO `ko_settings` VALUES('default_view_reservation', 'show_cal_monat');

diff --git a/kool_update_r45_r46.php b/kool_update_r45_r46.php
@@ -91,7 +91,13 @@ function saveLeuteSnapshot($ids) {
 
 
 
-// transform admin default view userprefs
+// transform admin default view in settings and userprefs
+db_update_data(
+	'ko_settings',
+	"WHERE `key` = 'default_view_admin' AND `value` = 'set_layout'",
+	array('key' => 'default_view_admin', 'value' => 'admin_settings')
+);
+
 $users = db_select_distinct('ko_userprefs', 'user_id', '', "WHERE `key` = 'default_view_admin' ");
 
 foreach ($users as $user) {

diff --git a/templates/ko_menu.tpl b/templates/ko_menu.tpl
@@ -112,7 +112,7 @@
 											{assign var="menuAction" value=$module_settings_action.$menuId }
 											{assign var="menuLLKey" value="submenu_`$menuId`_`$menuAction`"}
 											{if !$firstSubMenuPoint}<li class="divider" role="presentation"></li>{/if}
-											<li class="{if $menu.id == $tpl_menu_akt && $tpl_action == $menuAction}active{/if}"><a class="clearfix" href="/{$menuId}?action={$menuAction}"><span class="pull-left">{ll key=$menuLLKey}</span><i class="fa fa-cog dropdown-icon"></i></a></li>
+											<li class="{if $menu.id == $tpl_menu_akt && $tpl_action == $menuAction}active{/if}"><a class="clearfix" href="{$ko_path}{$menuId}/index.php?action={$menuAction}"><span class="pull-left">{ll key=$menuLLKey}</span><i class="fa fa-cog dropdown-icon"></i></a></li>
 										{/if}
 									</ul>
 								{/if}