From 07541bf9336636c55d5f110ec1d9cc5b26be6396 Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Sat, 9 Sep 2017 15:26:17 +0100
Subject: [PATCH] Do not show migration module if no migration is required
 (#1440)

---
 application/controllers/Migrate.php           |  2 +-
 application/controllers/Secure_Controller.php | 19 ++++++++++++++++---
 application/views/home.php                    |  4 ++--
 application/views/office.php                  |  4 ++--
 application/views/partial/header.php          |  2 +-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/application/controllers/Migrate.php b/application/controllers/Migrate.php
index 70c3bf2ff..7188626d7 100644
--- a/application/controllers/Migrate.php
+++ b/application/controllers/Migrate.php
@@ -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())));
 		}
diff --git a/application/controllers/Secure_Controller.php b/application/controllers/Secure_Controller.php
index 3125ae518..5ff572a37 100644
--- a/application/controllers/Secure_Controller.php
+++ b/application/controllers/Secure_Controller.php
@@ -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; }
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/application/views/home.php b/application/views/home.php
index 3993b2604..ce2ebeebf 100644
--- a/application/views/home.php
+++ b/application/views/home.php
@@ -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"); ?>
\ No newline at end of file
+<?php $this->load->view("partial/footer"); ?>
diff --git a/application/views/office.php b/application/views/office.php
index f55c47bb4..9bacfbb66 100644
--- a/application/views/office.php
+++ b/application/views/office.php
@@ -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"); ?>
\ No newline at end of file
+<?php $this->load->view("partial/footer"); ?>
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index 80420f109..ca82a1202 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -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); ?>"