dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- improved "set rally point" dialog

Browse Source 
- fixed wrong character name on poke notifications, closed #297
This commit is contained in:
Exodus4D
2016-08-27 23:59:42 +02:00
parent bc71cd5633
commit 0e39f8c2d1
17 changed files with 222 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/main/controller/api/map.php
View File

@@ -8,6 +8,7 @@
namespace Controller\Api;
use Controller;
use lib\Config;
use Model;
/**
@@ -178,6 +179,11 @@ class Map extends Controller\AccessController {
'ssoLogin' => $this->getF3()->alias( 'sso', ['action' => 'requestAuthorization'] )
];
// get notification status ------------------------------------------------------------------------------------
$return->notificationStatus = [
'rallySet' => (bool)Config::getNotificationMail('RALLY_SET')
];
// get SSO error messages that should be shown immediately ----------------------------------------------------
// -> e.g. errors while character switch from previous HTTP requests
if( $f3->exists(Controller\Ccp\Sso::SESSION_KEY_SSO_ERROR) ){
@@ -574,6 +580,10 @@ class Map extends Controller\AccessController {
if(is_object($filteredMap->systems)){
// update
unset($systemData['updated']);
/**
* @var $system Model\SystemModel
*/
$system = $filteredMap->systems->current();
$system->setData($systemData);
$system->updatedCharacterId = $activeCharacter;
@@ -603,6 +613,10 @@ class Map extends Controller\AccessController {
if(is_object($filteredMap->connections)){
// update
unset($connectionData['updated']);
/**
* @var $connection Model\ConnectionModel
*/
$connection = $filteredMap->connections->current();
$connection->setData($connectionData);
$connection->save();