mti
/
ptut-vhost
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update version id + currentDatabase when switching department

This commit is contained in:
xdrm-brackets 2018-05-09 15:12:26 +02:00
parent 3dfa1cc525
commit 13e545e5f9
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/api/module/departmentController.php
View File

@ -75,11 +75,29 @@ class departmentController
foreach($deps as $dep){ foreach($deps as $dep){
if( $dep['idDep'] == $department){ if( $dep['idDep'] == $department ){
$_SESSION['AvailableDepartments'] = $deps; $_SESSION['AvailableDepartments'] = $deps;
$_SESSION['CurrentDatabase'] = $dep['dbName'];
$_SESSION['CurrentDepartmentId'] = $dep['idDep']; $_SESSION['CurrentDepartmentId'] = $dep['idDep'];
$_SESSION['VERSION'] = [
'list' => $dep['versions'],
'current' => null
];
// select version with default = 1
foreach($_SESSION['VERSION']['list'] as $v){
if( $v['default'] == 1 ){
$_SESSION['VERSION']['current'] = intval($v['iddatabase']);
$_SESSION['CurrentDatabase'] = $v['dbName'];
break;
}
}
// if no default -> select first
if( !is_int($_SESSION['VERSION']) ){
$_SESSION['VERSION']['current'] = intval($_SESSION['VERSION']['list'][0]['iddatabase']);
$_SESSION['CurrentDatabase'] = $_SESSION['VERSION']['list'][0]['dbName'];
}
return ['switched' => true]; return ['switched' => true];

5
webpack/vue/header.vue
View File

@ -125,7 +125,6 @@ export default {
// 3. Ask for department change // 3. Ask for department change
api.call(`GET department/version/switch/${id}`, {}, function(rs){ api.call(`GET department/version/switch/${id}`, {}, function(rs){
console.log(rs);
// 1. error -> do nothing // 1. error -> do nothing
if( rs.error !== 0 ) if( rs.error !== 0 )
@ -169,8 +168,8 @@ export default {
if( rs.error !== 0 || !rs.hasOwnProperty('created_id') ){ if( rs.error !== 0 || !rs.hasOwnProperty('created_id') ){
return popup.ask({ return popup.ask({
title: 'Error ('+err_code+')', title: 'Erreur ('+err_code+')',
content: 'La création de sauvegarde à échoué.', content: 'La création de version à échoué.',
action: 'OK', action: 'OK',
type: 'neutral' type: 'neutral'
}, () => {}); }, () => {});