mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-24 08:20:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

No password change in testing mode (#2073)

Browse Source
This commit is contained in:
jekkos
2018-08-17 23:54:47 +02:00
parent 76c63f6a60
commit f20ba23640
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Employees.php
View File

@@ -121,7 +121,7 @@ class Employees extends Persons
}
//Password has been changed OR first time password set
if($this->input->post('password') != '')
if($this->input->post('password') != '' && ENVIRONMENT != 'testing')
{
$exploded = explode(":", $this->input->post('language'));
$employee_data = array(

6
application/models/Employee.php
View File

@@ -119,11 +119,9 @@ class Employee extends Person
//Now insert the new grants
if($success)
{
$count = 0;
foreach($grants_data as $grant)
{
$success = $this->db->insert('grants', array('permission_id' => $grant['permission_id'], 'person_id' => $employee_id, 'menu_group' => $grant['menu_group']));
$count = $count+ 1;
}
}
}
@@ -473,6 +471,10 @@ class Employee extends Person
{
$success = FALSE;
if (ENVIRONMENT == 'testing') {
return $success;
}
//Run these queries as a transaction, we want to make sure we do all or nothing
$this->db->trans_start();