diff --git a/api/config_sample.php b/api/config_sample.php index 9be9cf64f..ec98d666a 100644 --- a/api/config_sample.php +++ b/api/config_sample.php @@ -10,7 +10,7 @@ $mode = 'dev'; # Database credentials, db = hostname/database - $isb = array('user' => 'user', 'pass' => 'pass', 'db' => 'localhost/ispyb'); + $isb = array('user' => 'user', 'pass' => 'pass', 'db' => 'localhost/ispyb'); $dbtype = 'mysql'; # Encoded JWT key, used to sign and check validaty of jwt tokens diff --git a/api/index.php b/api/index.php index a16c214de..286e85749 100644 --- a/api/index.php +++ b/api/index.php @@ -67,7 +67,7 @@ function setupApplication($mode): Slim }); $app->get('/options', function () use ($app) { - global $motd, $authentication_type, $cas_url, $cas_sso, $sso_url, $package_description, + global $mode, $motd, $authentication_type, $cas_url, $cas_sso, $sso_url, $package_description, $facility_courier_countries, $facility_courier_countries_nde, $facility_courier_countries_link, $icat_base_url, $visit_persist_storage_dir_segment, $dhl_enable, $scale_grid, $scale_grid_end_date, $preset_proposal, $timezone, $valid_components, $enabled_container_types, $synchweb_version, $redirects, @@ -78,6 +78,7 @@ function setupApplication($mode): Slim $app->contentType('application/json'); $options = $app->container['options']; $app->response()->body(json_encode(array( + 'mode' => $mode == 'production' ? 'production' : 'development', 'motd' => $options->get('motd', $motd), 'authentication_type' => $authentication_type, 'cas_url' => $cas_url, diff --git a/client/src/js/app/components/breadcrumbs.vue b/client/src/js/app/components/breadcrumbs.vue index b2f1f548a..5bacdd3f4 100644 --- a/client/src/js/app/components/breadcrumbs.vue +++ b/client/src/js/app/components/breadcrumbs.vue @@ -37,12 +37,6 @@ export default { \ No newline at end of file + diff --git a/client/src/js/app/components/header.vue b/client/src/js/app/components/header.vue index ac2758223..2f35f9028 100644 --- a/client/src/js/app/components/header.vue +++ b/client/src/js/app/components/header.vue @@ -1,4 +1,12 @@