yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-07 21:58:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1581 from kamalbennani/bugfix/#1580/take-into-account-allowGa-config-prop

Browse Source 
Take into account allowGa value
This commit is contained in:
Jim LAURIE 2018-07-17 12:07:25 +02:00 committed by GitHub
commit bc447d1167
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/strapi-admin/admin/src/containers/AdminPage/saga.js
View File

@ -11,15 +11,15 @@ import { GET_GA_STATUS, GET_LAYOUT } from './constants';
function* getGaStatus() { function* getGaStatus() {
try { try {
const [allowGa, strapiVersion, currentEnvironment] = yield [ const [{ allowGa }, { strapiVersion }, { currentEnvironment }] = yield [
call(request, '/admin/gaConfig', { method: 'GET' }), call(request, '/admin/gaConfig', { method: 'GET' }),
call(request, '/admin/strapiVersion', { method: 'GET' }), call(request, '/admin/strapiVersion', { method: 'GET' }),
call(request, '/admin/currentEnvironment', { method: 'GET' }), call(request, '/admin/currentEnvironment', { method: 'GET' }),
]; ];
yield put(getCurrEnvSucceeded(currentEnvironment.currentEnvironment)); yield put(getCurrEnvSucceeded(currentEnvironment));
yield put(getGaStatusSucceeded(allowGa)); yield put(getGaStatusSucceeded(allowGa));
yield put(getStrapiVersionSucceeded(strapiVersion.strapiVersion)); yield put(getStrapiVersionSucceeded(strapiVersion));
} catch(err) { } catch(err) {
strapi.notification.error('notification.error'); strapi.notification.error('notification.error');
} }