mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-18 13:28:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not show migration module if no migration is required (#1440)

Browse Source
This commit is contained in:
FrancescoUK
2017-09-09 15:26:17 +01:00
parent ec76d85350
commit 07541bf933
5 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Migrate.php
View File

@@ -18,7 +18,7 @@ class Migrate extends Secure_Controller
public function perform_migration()
{
if( ! $this->migration->latest())
if(!$this->migration->latest())
{
echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('migrate_failed - ' . $this->migration->error_string())));
}

19
application/controllers/Secure_Controller.php
View File

@@ -38,14 +38,27 @@ class Secure_Controller extends CI_Controller
{
$this->session->set_userdata('menu_group', $menu_group);
}
if($menu_group == 'home')
{
$data['allowed_modules'] = $this->Module->get_allowed_home_modules($logged_in_employee_info->person_id);
$allowed_modules = $this->Module->get_allowed_home_modules($logged_in_employee_info->person_id);
}
else
{
$data['allowed_modules'] = $this->Module->get_allowed_office_modules($logged_in_employee_info->person_id);
$allowed_modules = $this->Module->get_allowed_office_modules($logged_in_employee_info->person_id);
}
// do not show migrate module if no migration is required
$this->load->library('migration');
foreach($allowed_modules->result() as $module)
{
if(!$this->migration->latest() || $module->module_id != 'migrate')
{
$data['allowed_modules'][] = $module;
}
}
$data['user_info'] = $logged_in_employee_info;
$data['controller_name'] = $module_id;
@@ -123,4 +136,4 @@ class Secure_Controller extends CI_Controller
public function delete() { return FALSE; }
}
?>
?>

4
application/views/home.php
View File

@@ -8,7 +8,7 @@
<div id="home_module_list">
<?php
foreach($allowed_modules->result() as $module)
foreach($allowed_modules as $module)
{
?>
<div class="module_item" title="<?php echo $this->lang->line('module_'.$module->module_id.'_desc');?>">
@@ -20,4 +20,4 @@
?>
</div>
<?php $this->load->view("partial/footer"); ?>
<?php $this->load->view("partial/footer"); ?>

4
application/views/office.php
View File

@@ -8,7 +8,7 @@
<div id="office_module_list">
<?php
foreach($allowed_modules->result() as $module)
foreach($allowed_modules as $module)
{
?>
<div class="module_item" title="<?php echo $this->lang->line('module_'.$module->module_id.'_desc');?>">
@@ -20,4 +20,4 @@
?>
</div>
<?php $this->load->view("partial/footer"); ?>
<?php $this->load->view("partial/footer"); ?>

2
application/views/partial/header.php
View File

@@ -123,7 +123,7 @@
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<?php foreach($allowed_modules->result() as $module): ?>
<?php foreach($allowed_modules as $module): ?>
<li class="<?php echo $module->module_id == $this->uri->segment(1) ? 'active' : ''; ?>">
<a href="<?php echo site_url("$module->module_id"); ?>"
title="<?php echo $this->lang->line("module_" . $module->module_id); ?>"