diff --git a/README.md b/README.md index 85fc73f21..0c02868db 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Updating the UI only --- [![osx-serve-install](https://github.com/e-mission/e-mission-phone/workflows/osx-serve-install/badge.svg)](https://github.com/e-mission/e-mission-phone/actions?query=workflow%3Aosx-serve-install) -If you want to make only UI changes, (as opposed to modifying the existing plugins, adding new plugins, etc), you can use the **new and improved** (as of June 2018) e-mission dev app. +If you want to make only UI changes, (as opposed to modifying the existing plugins, adding new plugins, etc), you can use the **new and improved** (as of June 2018) [e-mission dev app](https://github.com/e-mission/e-mission-devapp/) and install the most recent version from [releases](https://github.com/e-mission/e-mission-devapp/releases). ### Installing (one-time) diff --git a/setup/setup_serve.sh b/setup/setup_serve.sh index 09c10b2b6..6eaf54d5e 100644 --- a/setup/setup_serve.sh +++ b/setup/setup_serve.sh @@ -15,3 +15,5 @@ npx bower update --allow-root echo "Pulling the plugin-specific UIs" npm run setup-serve + +npx cordova prepare diff --git a/www/js/common/services.js b/www/js/common/services.js index a7d578eb3..8dc6daab2 100644 --- a/www/js/common/services.js +++ b/www/js/common/services.js @@ -177,7 +177,7 @@ angular.module('emission.main.common.services', ['emission.plugin.logger']) +" data = "+JSON.stringify(response.data)); return address2Name(response.data); }).catch((error) => { - Logger.displayError("while reading address data ",error); + // Logger.displayError("while reading address data ",error); }); }; diff --git a/www/js/control/general-settings.js b/www/js/control/general-settings.js index 3d3b0ea28..e002be516 100644 --- a/www/js/control/general-settings.js +++ b/www/js/control/general-settings.js @@ -190,9 +190,13 @@ angular.module('emission.main.control',['emission.services', // Backwards compat hack to fill in the `app_required` based on the // old-style "program_or_study" // remove this at the end of 2023 when all programs have been migrated over - $scope.ui_config.intro.app_required = $scope.ui_config?.intro.app_required || $scope.ui_config?.intro.program_or_study == 'program'; + if ($scope.ui_config.intro.app_required == undefined) { + $scope.ui_config.intro.app_required = $scope.ui_config?.intro.program_or_study == 'program'; + } $scope.ui_config.opcode = $scope.ui_config.opcode || {}; - $scope.ui_config.opcode.autogen = $scope.ui_config?.opcode?.autogen || $scope.ui_config?.intro.program_or_study == 'study'; + if ($scope.ui_config.opcode.autogen == undefined) { + $scope.ui_config.opcode.autogen = $scope.ui_config?.intro.program_or_study == 'study'; + } $scope.refreshScreen(); }); }); diff --git a/www/templates/appstatus/permissioncheck.html b/www/templates/appstatus/permissioncheck.html index b2099bb81..2adce3bab 100644 --- a/www/templates/appstatus/permissioncheck.html +++ b/www/templates/appstatus/permissioncheck.html @@ -12,8 +12,8 @@