Skip to content

Commit

Permalink
bug fix nearbeach-1029 Can't have _ in username
Browse files Browse the repository at this point in the history
  • Loading branch information
Luke Clarke committed Jun 30, 2023
1 parent b46ba3b commit f83da1b
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion NearBeach/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name = "NearBeach"
__version__ = "0.30.0.RC1"
__version__ = "0.30.0-RC2"
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/8362.min.js

Large diffs are not rendered by default.

Binary file modified NearBeach/static/NearBeach/8362.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/NearBeach.min.js

Large diffs are not rendered by default.

Binary file modified NearBeach/static/NearBeach/NearBeach.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/new-user.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified NearBeach/static/NearBeach/new-user.min.js.gz
Binary file not shown.
6 changes: 4 additions & 2 deletions NearBeach/views/document_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,14 +390,16 @@ def private_download_file(request, document_key):
Key=f"{document_results.document}",
)

print(response["Body"])

return FileResponse(
response["Body"],
as_attachment=True,
filename=document_results.document_description,
)

# if hasattr(settings, "AZURE_STORAGE_CONNECTION_STRING"):
# Use Azure to download
# blob_service_client = BlobServiceClient.from_connection_string(connect_str)

# Normal setup - find document on server and serve
# Get the Document path information
path = f"{settings.PRIVATE_MEDIA_ROOT}/{document_results.document}"
Expand Down
2 changes: 2 additions & 0 deletions local/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@

USE_TZ = True

AZURE_STORAGE_CONNECTION_STRING = os.getenv("AZURE_STORAGE_CONNECTION_STRING")
AZURE_STORAGE_CONTAINER_NAME = os.getenv("AZURE_STORAGE_CONTAINER_NAME")

PROJECT_PATH = os.path.abspath(os.path.dirname(__file__))
PRIVATE_MEDIA_ROOT = os.path.join(PROJECT_PATH, 'private')
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nearbeach",
"version": "0.30.0.RC1",
"version": "0.30.0-RC2",
"description": "NearBeach - an Open Source project management system built with Django web framework",
"main": "/src/js/app.js",
"directories": {
Expand Down
3 changes: 1 addition & 2 deletions src/js/components/users/NewUser.vue
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
//Validation
import useVuelidate from "@vuelidate/core";
import { alphaNum, email, required } from "@vuelidate/validators";
import { email, required } from "@vuelidate/validators";
import ValidationRendering from "../validation/ValidationRendering.vue";
export default {
Expand Down Expand Up @@ -184,7 +184,6 @@
required,
},
usernameModel: {
alphaNum,
required,
},
},
Expand Down

0 comments on commit f83da1b

Please sign in to comment.