Merge branch 'hotfix/0.11.5'

CHANGELOG.md

@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 0.11.5
+
+Hotfixes for 0.10.0
+
+### Fixed
+- Drag and Drop file uploading fixed
+- New location creation fixed
+
 ## 0.11.4
 
 More hotfixes for 0.10.0

PlanarAlly/VERSION

@@ -1 +1 @@
-0.11.4
+0.11.5

PlanarAlly/api/asset_manager.py

@@ -101,8 +101,6 @@ async def assetmgmt_rm(sid, data):
 async def assetmgmt_upload(sid, file_data):
     uuid = file_data["uuid"]
 
-    print(f'{file_data["slice"]}/{file_data["totalSlices"]}')
-
     if uuid not in state.pending_file_upload_cache:
         state.pending_file_upload_cache[uuid] = {}
     state.pending_file_upload_cache[uuid][file_data["slice"]] = file_data

PlanarAlly/api/location.py

@@ -86,8 +86,10 @@ async def change_location(sid, location):
 
     for room_player in room.players:
         for psid in state.get_sids(user=room_player.player, room=room):
-            sio.leave_room(psid, old_location.get_path(), namespace="/planarally")
-            sio.enter_room(psid, new_location.get_path(), namespace="/planarally")
+            sio.leave_room(psid, old_location.get_path(),
+                           namespace="/planarally")
+            sio.enter_room(psid, new_location.get_path(),
+                           namespace="/planarally")
             await load_location(psid, new_location)
 
 
@@ -126,7 +128,7 @@ async def add_new_location(sid, location):
         logger.warning(f"{user.name} attempted to add a new location")
         return
 
-    new_location = Location.create(room=room, name=location.name)
+    new_location = Location.create(room=room, name=location)
     new_location.add_default_layers()
 
-    await load_location(sid, location)
+    await load_location(sid, new_location)

PlanarAlly/templates/assets.jinja2

@@ -9,7 +9,7 @@
 <div id='AssetManager' v-cloak>
     <div id='titlebar'>Asset Manager</div>
     <div id='main'>
-        <div id='assets' @dragover.prevent="moveDrag" @drop.prevent.stop="stopDrag($event, '.')">
+        <div id='assets' @dragover.prevent="moveDrag" @drop.prevent.stop="stopDrag($event, currentFolder)">
             <div id='breadcrumbs'>
                 <div>/</div><div v-for="dir in path">[[ idMap.get(dir).name ]]</div>
             </div>
@@ -69,5 +69,5 @@
     <prompt ref="prompt"></prompt>
     <confirm ref="confirm"></confirm>
 </div>
-<script type="text/javascript" src="/static/js/assets.79ff60c1178487289de4.js"></script></body>
+<script type="text/javascript" src="/static/js/assets.45a2c924f4f1647c4a68.js"></script></body>
 </html>

PlanarAlly/templates/assets.pre.jinja2

@@ -9,7 +9,7 @@
 <div id='AssetManager' v-cloak>
     <div id='titlebar'>Asset Manager</div>
     <div id='main'>
-        <div id='assets' @dragover.prevent="moveDrag" @drop.prevent.stop="stopDrag($event, '.')">
+        <div id='assets' @dragover.prevent="moveDrag" @drop.prevent.stop="stopDrag($event, currentFolder)">
             <div id='breadcrumbs'>
                 <div>/</div><div v-for="dir in path">[[ idMap.get(dir).name ]]</div>
             </div>

PlanarAlly/templates/planarally.jinja2

@@ -63,5 +63,5 @@
     <prompt-dialog ref="prompt"></prompt-dialog>
     <confirm-dialog ref="confirm"></confirm-dialog>
 </div>
-<script type="text/javascript" src="/static/js/planarally.79ff60c1178487289de4.js"></script></body>
+<script type="text/javascript" src="/static/js/planarally.45a2c924f4f1647c4a68.js"></script></body>
 </html>