Commit 2e2bd29c authored by Elena Grassi's avatar Elena Grassi
Browse files

[WGN] openmaptiles attribution and removed initiatives/children for virtual markers

parent 7ebc3e4b
......@@ -1055,9 +1055,9 @@
"cluster_limit": 18,
"max_zoom": 18,
"tile_view" : "http://devtiles.firstlife.org/styles/klokantech-basic/{z}/{x}/{y}.png",
"tile_view_attribution": "Tiles and Data by <a href='http://openstreetmap.org'>OpenStreetMap</a>, under <a href='http://www.openstreetmap.org/copyright'>ODbL</a>.",
"tile_view_attribution": "Tiles and Data by <a href='http://openmaptiles.org/' rel='nofollow'>© OpenMapTiles</a> and <a href='http://openstreetmap.org'>OpenStreetMap Contributors</a>, under <a href='http://www.openstreetmap.org/copyright'>ODbL</a>.",
"tile_edit" : "http://devtiles.firstlife.org/styles/klokantech-basic/{z}/{x}/{y}.png",
"tile_edit_attribution": "Tiles and Data by <a href='http://openstreetmap.org'>OpenStreetMap</a>, under <a href='http://www.openstreetmap.org/copyright'>ODbL</a>."
"tile_edit_attribution": "Tiles and Data by <a href='http://openmaptiles.org/' rel='nofollow'>© OpenMapTiles</a> and <a href='http://openstreetmap.org'>OpenStreetMap Contributors</a>, under <a href='http://www.openstreetmap.org/copyright'>ODbL</a>."
},
"behaviour":{
"is_login_required" : false,
......
......@@ -459,6 +459,7 @@ angular.module('firstlife.directives').directive('thingCard', function () {
if ($scope.config.behaviour.virtualMarkers && $scope.config.behaviour.virtualMarkers.length !== 0) {
$scope.virtual = myConfig.behaviour.virtualMarkers.indexOf(marker.entity_type) !== -1;
}
},
function (err) {
$log.error("changeModal, errore ", err);
......@@ -1059,7 +1060,8 @@ angular.module('firstlife.directives').directive('thingCard', function () {
show: '&show',
add: '&',
close: '&',
startediting: "="
startediting: "=",
virtual: "="
},
templateUrl: '/templates/thing/modalLists.html',
link: function (scope, element, attrs) {
......@@ -1082,6 +1084,10 @@ angular.module('firstlife.directives').directive('thingCard', function () {
scope.disableContents = myConfig.behaviour.disable_contents;
scope.disablePosts = !angular.equals(myConfig.behaviour.postIsRating, {});
// scope.disableRatings = angular.equals(myConfig.behaviour.postIsRating, {});
if (scope.virtual) {
scope.disableInitiatives = true;
scope.disableContents = true;
}
var hasRating = false;
for (var key in myConfig.behaviour.postIsRating) {
if (myConfig.behaviour.postIsRating[key].for.includes(scope.marker.entity_type)) {
......
......@@ -152,7 +152,7 @@
</div>
<modal-lists ng-if="infoPlace.marker" marker="infoPlace.marker" show="showMCardPlace(id)" add="addChildEntity()" startediting="startEditing"
close="closeModal()"></modal-lists>
virtual="virtual" close="closeModal()"></modal-lists>
<loader ng-if="!infoPlace.marker"></loader>
......
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