Skip to content

Commit 33537c0

Browse files
authored
grid experimental refactor (#972)
* grid experimental refactor * refactored button logic * minor core reorg * more refactoring for readability * more cleanup
1 parent 5fffedd commit 33537c0

2 files changed

Lines changed: 249 additions & 323 deletions

File tree

py4web/core.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,9 @@ def URL( # pylint: disable=invalid-name
872872
request.environ.get("SCRIPT_NAME", "")
873873
or request.environ.get("HTTP_X_SCRIPT_NAME", "")
874874
).rstrip("/")
875-
if parts and parts[0].startswith("/"):
875+
if not parts:
876+
prefix = request.path
877+
elif parts and parts[0].startswith("/"):
876878
prefix = ""
877879
elif has_appname and app_name != "_default":
878880
prefix = f"{script_name}/{app_name}/"
@@ -904,7 +906,9 @@ def URL( # pylint: disable=invalid-name
904906
signer.sign(prefix + "/".join(broken_parts), urlvars)
905907
if urlvars:
906908
url += "?" + "&".join(
907-
f"{k}={urllib.parse.quote(str(v))}" for k, v in urlvars.items()
909+
f"{k}={urllib.parse.quote(str(v))}"
910+
for k, v in urlvars.items()
911+
if v is not None
908912
)
909913
if hash:
910914
url += f"#{hash}"

0 commit comments

Comments
 (0)