Commit 02b35407 authored by Benoit Lavenier's avatar Benoit Lavenier

set default country to France

parent c2bb5bb2
......@@ -21,7 +21,8 @@
"enable": true,
"host": "data.gchange.fr",
"port": "443",
"maxUploadBodySize": 2097152
"maxUploadBodySize": 2097152,
"defaultCountry": "France"
},
"market": {
"enable": true,
......@@ -58,7 +59,8 @@
"es": {
"enable": true,
"host": "data.gchange.fr",
"port": "443"
"port": "443",
"defaultCountry": "France"
},
"market": {
"enable": true,
......@@ -127,7 +129,8 @@
"enable": true,
"host": "localhost",
"port": "9200",
"wsPort": "9400"
"wsPort": "9400",
"defaultCountry": "France"
},
"market": {
"enable": true
......
......@@ -30,11 +30,12 @@ angular.module("cesium.config", [])
"enable": true,
"host": "data.gchange.fr",
"port": "443",
"maxUploadBodySize": 2097152
"maxUploadBodySize": 2097152,
"defaultCountry": "France"
},
"market": {
"enable": true,
"geoDistance": "20km",
"searchDistance": "20km",
"cesiumApi": {
"enable": true,
"baseUrl": "https://g1.duniter.fr/api"
......@@ -42,7 +43,7 @@ angular.module("cesium.config", [])
}
},
"version": "0.5.7",
"build": "2017-08-31T10:03:07.002Z",
"build": "2017-11-03T16:37:37.457Z",
"newIssueUrl": "https://github.com/duniter-gchange/gchange-client/issues/new?labels=bug"
})
......
......@@ -16,11 +16,11 @@ angular.module('cesium.es.settings.services', ['cesium.services', 'cesium.es.htt
var
SETTINGS_SAVE_SPEC = {
includes: ['locale', 'useLocalStorage', 'expertMode', 'logoutIdle'],
includes: ['locale', 'useRelative', 'useLocalStorage', 'expertMode', 'logoutIdle'],
excludes: ['newIssueVersion', 'timeout', 'cacheTimeMs', 'time', 'login', 'build'],
plugins: {
es: {
excludes: ['enable', 'host', 'port', 'wsPort']
excludes: ['enable', 'host', 'port', 'wsPort', 'fallbackNodes']
}
},
helptip: {
......@@ -40,7 +40,14 @@ angular.module('cesium.es.settings.services', ['cesium.services', 'cesium.es.htt
},
invitations: {
readTime: true
}
},
defaultCountry: undefined,
enableGoogleApi: false,
googleApiKey: undefined,
wot: {
enableMixedSearch: true
},
geoDistance: '20km'
}
}
}, {plugins: {es: csConfig.plugins && csConfig.plugins.es || {}}}),
......
......@@ -496,6 +496,13 @@ function MkRecordEditController($scope, $q, $state, $ionicPopover, mkRecord, $io
if (!$scope.formData.currency) {
$scope.formData.currency = $scope.currency;
}
// Convert old record format
if (!$scope.formData.city && $scope.formData.location) {
$scope.formData.city = $scope.formData.location;
$scope.formData.location = null;
}
$scope.id = data.id;
$scope.pictures = data.record.pictures || [];
delete $scope.formData.pictures; // duplicated with $scope.pictures
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment