jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure map name is always read from backend

Browse source 
fix #605
This commit is contained in:
Yohan Boniface 2018-08-04 15:26:12 +02:00
parent c143c2c7ab
commit e319fa963e
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
umap/models.py
View file

@ -189,7 +189,8 @@ class Map(NamedModel):
elif request.user == self.owner: elif request.user == self.owner:
can = True can = True
else: else:
can = not (self.share_status == self.PRIVATE and request.user not in self.editors.all()) can = not (self.share_status == self.PRIVATE
and request.user not in self.editors.all())
return can return can
@property @property
@ -204,7 +205,7 @@ class Map(NamedModel):
new.pk = None new.pk = None
new.name = u"%s %s" % (_("Clone of"), self.name) new.name = u"%s %s" % (_("Clone of"), self.name)
if "owner" in kwargs: if "owner" in kwargs:
# can be None in case of anonymous cloning # can be None in case of anonymous cloning
new.owner = kwargs["owner"] new.owner = kwargs["owner"]
new.save() new.save()
for editor in self.editors.all(): for editor in self.editors.all():

3
umap/views.py
View file

@ -350,7 +350,7 @@ class MapDetailMixin:
model = Map model = Map
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(MapDetailMixin, self).get_context_data(**kwargs) context = super().get_context_data(**kwargs)
properties = { properties = {
'urls': _urls_for_js(), 'urls': _urls_for_js(),
'tilelayers': TileLayer.get_list(), 'tilelayers': TileLayer.get_list(),
@ -447,6 +447,7 @@ class MapView(MapDetailMixin, DetailView):
map_settings = self.object.settings map_settings = self.object.settings
if "properties" not in map_settings: if "properties" not in map_settings:
map_settings['properties'] = {} map_settings['properties'] = {}
map_settings['properties']['name'] = self.object.name
permissions = {} permissions = {}
permissions['edit_status'] = self.object.edit_status permissions['edit_status'] = self.object.edit_status
permissions['share_status'] = self.object.share_status permissions['share_status'] = self.object.share_status