diff --git a/desktop.php b/desktop.php index 6b53817..2faafe3 100644 --- a/desktop.php +++ b/desktop.php @@ -30,15 +30,13 @@ - - - - - - - - + + + --> + + + diff --git a/generic_data/Functions/functions.xml b/generic_data/Functions/functions.xml index 68d8002..fb629e1 100644 --- a/generic_data/Functions/functions.xml +++ b/generic_data/Functions/functions.xml @@ -101,6 +101,10 @@ Arc-tangent atan + + Arc-tangent + atan_2f + cosine cos @@ -109,11 +113,11 @@ Hyperbolic cosine cosh - + Natural exponential function exp diff --git a/generic_data/SpecialSettings/Groups.xml b/generic_data/SpecialSettings/Groups.xml index f978c01..bcf1e15 100644 --- a/generic_data/SpecialSettings/Groups.xml +++ b/generic_data/SpecialSettings/Groups.xml @@ -1,4 +1,5 @@ - + + diff --git a/index.html b/index.html index 5338fc0..266fd8c 100644 --- a/index.html +++ b/index.html @@ -1 +1,53 @@ - Welcome on Amda
Try AMDA as a guest
login: guest
password : your e-mail address
Announcements
12/05/2016
New instance for CU tests
\ No newline at end of file + + + + +AmdaNG Login + + + + + + + + + + +
+ + + Supported Browsers
+ Firefox
+ + + Safari
+ Google-Chrome + + + + + + built with the Ext JS library. + + + + + + I forgot my password + +
+ + + + + + +
+ + +
+ + + \ No newline at end of file diff --git a/js/lib/ext-override.js b/js/lib/ext-override.js index 0200f76..76c204c 100644 --- a/js/lib/ext-override.js +++ b/js/lib/ext-override.js @@ -95,10 +95,25 @@ Ext.onReady(function () { comp.setPosition(x,y); } } - });*/ - + }); - /*Ext.override(Ext.selection.Model, { + Ext.override(Ext.selection.TreeModel, { + + onRowClick: function (view, record, item, index, e) { + // Record index will be -1 if the clicked record is a metadata record and not selectable + if (index !== -1) { + if (!this.allowRightMouseSelection(e)) { + return ; + } + + //Don't process if it's a right-click over a previously selected record. + // if (!(e.type === 'contextmenu' && this.isSelected(record))) { + this.processSelection(view, record, item, index, e); + // } + } + } + }); + Ext.override(Ext.selection.Model, { storeHasSelected: function(record) { var store = this.store, records, diff --git a/php/AmdaUpdate.php b/php/AmdaUpdate.php index 0122b0c..dd7cbcc 100644 --- a/php/AmdaUpdate.php +++ b/php/AmdaUpdate.php @@ -21,8 +21,7 @@ exit(1); } $updateOnly = false; - } - + } $amda = new AmdaClient($updateOnly); @@ -37,35 +36,6 @@ } */ } - - $locBases = $amda->getAvailableMissions(); - - if(is_string($locBases)) { - $msg = "Warning: No Local Amda Data info exists!".PHP_EOL; - print_r($msg); - } - else { - -/* -* update DD_*.xml files for local bases. If 'updateOnly', we keep DD_*.xml that already exists to not erase current user modifications. -*/ - $amda->getDDLocalParamsFiles($locBases); - -/* -* Update Start Stop for AMDA local data -*/ - $ok = $amda->updateStartStop($locBases); - -/* - * Create/update Orbites.xml file - */ -// if (!$updateOnly) { -// $postProcessing = new PostProcessing(); -// $postProcessing->createOrbites(); -// $postProcessing->createOrbites(LocalDataParam.'InternalParams.xml'); -// $postProcessing->createOrbitesInfoFiles($locBases); -// } - /* * Get available external bases if exist */ diff --git a/php/classes/AmdaAction.php b/php/classes/AmdaAction.php index d28e744..6f9ee0a 100644 --- a/php/classes/AmdaAction.php +++ b/php/classes/AmdaAction.php @@ -906,9 +906,11 @@ class AmdaAction private function executeRequest($obj, $function) { - $res = $this->checkUser($obj); - if (!$res['success']) return $res; - + if ($function != FunctionTypeEnumClass::PROCESSDELETE) { + $res = $this->checkUser($obj); + if (!$res['success']) return $res; + } + $requestManager = new RequestManagerClass(); try diff --git a/php/my_config.php b/php/my_config.php index d6ade81..82ff221 100644 --- a/php/my_config.php +++ b/php/my_config.php @@ -3,18 +3,18 @@ * @file my_config.php * @version $Id: my_config.php 2372 2014-05-21 09:38:38Z myriam $ * - * */ //AKKA - Path to AMDA_Integration base dir -define('INTEGRATION_BASE_PATH', '/home/benjamin/AMDA-GIT/AMDA_Integration/'); +define('INTEGRATION_BASE_PATH', '/home/budnik/AMDA/AMDA_Integration/'); require_once(INTEGRATION_BASE_PATH.'config/AMDAIntegrationConfig.php'); define('CEFLIB', '/usr/local/cef/lib'); define('CDFLIB', '/opt/local/lib'); + define('SYS_LIBS', '/lib:/usr/lib:/usr/local/lib64'); -define('SYS_BIN','/bin:/usr/bin/:/usr/local/bin/'); +define('SYS_BIN', '/bin:/usr/bin/:/usr/local/bin/'); //AKKA - For compatibility with IHM define('BASE_PATH', IHM_SRC_DIR); @@ -26,9 +26,9 @@ define('log', IHM_SRC_DIR.'LOG'); // User apache define('APACHE_USER', 'apache'); // Alias for name of AMDA -define('APACHE_ALIAS', '/NEWAMDA-BENJAMIN/'); +define('APACHE_ALIAS', '/NEWAMDA/'); //email to send errors from AmdaUpdate/AmdaInstall -define('email','brenard@irap.omp.eu'); +define('email','ebudnik@irap.omp.eu'); //DDPATH define('DDBIN','/opt/local/bin/'); @@ -38,6 +38,7 @@ define('DDLIB','/opt/local/lib/'); define('DD_WSDL','http://amda-dev.irap.omp.eu/BASE/DDService/dd.wsdl'); define('TITLE', 'AMDANEW-Test'); + $is64 = true; ?> -- libgit2 0.21.2