From 5d554f9bf307b51ea973bd8e1cba673c22429dc1 Mon Sep 17 00:00:00 2001 From: hkernbach Date: Mon, 17 Oct 2016 11:55:34 +0200 Subject: [PATCH] ui edition mechanism --- js/apps/system/_admin/aardvark/APP/aardvark.js | 2 ++ .../aardvark/APP/frontend/js/routers/versionCheck.js | 9 --------- .../aardvark/APP/frontend/js/views/navigationView.js | 7 +++++++ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/js/apps/system/_admin/aardvark/APP/aardvark.js b/js/apps/system/_admin/aardvark/APP/aardvark.js index 278a9dfe7e..bab4664c93 100644 --- a/js/apps/system/_admin/aardvark/APP/aardvark.js +++ b/js/apps/system/_admin/aardvark/APP/aardvark.js @@ -48,10 +48,12 @@ module.exports = router; router.get('/config.js', function (req, res) { const scriptName = req.get('x-script-name'); const basePath = req.trustProxy && scriptName || ''; + const isEnterprise = internal.isEnterprise(); res.send( `var frontendConfig = ${JSON.stringify({ basePath: basePath, db: req.database, + isEnterprise: isEnterprise, authenticationEnabled: internal.authenticationEnabled(), isCluster: cluster.isCluster() })}` diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/routers/versionCheck.js b/js/apps/system/_admin/aardvark/APP/frontend/js/routers/versionCheck.js index 22ed27654e..34f4711971 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/routers/versionCheck.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/routers/versionCheck.js @@ -138,15 +138,6 @@ var currentVersion = window.versionHelper.fromString(data.version); - if (data.license) { - window.frontendConfig.license = data.license; - if (data.license !== 'community') { - $('#ArangoDBLogo').attr('src', 'img/arangodb_logo_alt.svg'); - } else { - $('.enterprise-menu').show(); - } - } - $('.navbar #currentVersion').html( ' ' + data.version.substr(0, 5) + '' ); diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/navigationView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/navigationView.js index 645eae334c..940e1de757 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/navigationView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/navigationView.js @@ -107,6 +107,13 @@ self.resize(); + console.log(window.frontendConfig); + if (window.frontendConfig.isEnterprise === true) { + $('#ArangoDBLogo').attr('src', 'img/arangodb_logo_alt.svg'); + } else { + $('.enterprise-menu').show(); + } + return this; },