implemented references to locations
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
@@ -98,8 +98,17 @@
|
||||
const res = await get(url);
|
||||
if (res.ok){
|
||||
yikes();
|
||||
var path = res.json();
|
||||
|
||||
const json = await res.json();
|
||||
const path = json.path;
|
||||
for (let owner of top_level){
|
||||
for (let loc of owner.locations){
|
||||
if (loc.id == path.id) {
|
||||
loc.locations = path.locations;
|
||||
location = json.location;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
error(res);
|
||||
return null;
|
||||
@@ -129,8 +138,8 @@
|
||||
} else error(res);
|
||||
}
|
||||
|
||||
function load(){
|
||||
loadUserLocations();
|
||||
async function load(){
|
||||
await loadUserLocations();
|
||||
loadPath();
|
||||
loadProperties();
|
||||
}
|
||||
@@ -235,4 +244,4 @@
|
||||
</div>
|
||||
{/if}
|
||||
{/await}
|
||||
</div>
|
||||
</div>
|
||||
@@ -300,7 +300,7 @@ public class SqliteDb extends BaseDb implements StockDb {
|
||||
var current = new HashMap<String,Object>();
|
||||
current.put(NAME,parent.name());
|
||||
current.put(ID,parent.id());
|
||||
current.put(PATH,root);
|
||||
current.put(LOCATIONS,List.of(root));
|
||||
root = current;
|
||||
location = parent;
|
||||
}
|
||||
|
||||
@@ -166,7 +166,7 @@ public class StockModule extends BaseHandler implements StockService {
|
||||
case null, default -> throw unprocessable("Unprocessable owner type: {0}",owner.type());
|
||||
};
|
||||
var pathToLocation = stockDb.pathToLocation(location);
|
||||
return sendContent(ex,Map.of(ITEMS,items,USERS,userIds,PATH,pathToLocation));
|
||||
return sendContent(ex,Map.of(ITEMS,items,USERS,userIds,PATH,pathToLocation,LOCATION,location.resolve().toMap()));
|
||||
}
|
||||
|
||||
private boolean getLocations(Path path, UmbrellaUser user, HttpExchange ex) throws IOException {
|
||||
|
||||
Reference in New Issue
Block a user