Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small fixes and Security Update #550

Merged
merged 10 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions boranga/components/conservation_status/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -2083,6 +2083,9 @@ def community_filter_list(self, request, *args, **kwargs):
"commonwealth_conservation_categories": CommonwealthConservationList.get_lists_dict(
group_type
),
"other_conservation_assessments": OtherConservationAssessmentList.get_lists_dict(
group_type
),
"processing_status_list": processing_status_list,
}
res_json = json.dumps(res_json)
Expand Down
6,457 changes: 3,234 additions & 3,223 deletions boranga/frontend/boranga/package-lock.json

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions boranga/frontend/boranga/src/components/internal/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@
</div>
</div>
</div>
<div v-else class="text-center mt-5">
<div class="spinner-border text-primary" role="status">
<span class="visually-hidden">Loading...</span>
</div>
</div>
</template>

<script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
<div class="row mb-2">
<div class="col-sm-12">
<button
class="btn btn-primary"
class="btn btn-primary w-100"
@click.prevent="
renameCommunity()
"
Expand Down Expand Up @@ -338,7 +338,7 @@
<div class="row">
<div class="col-sm-12">
<button
class="btn btn-primary"
class="btn btn-primary w-100"
@click.prevent="reopen()"
>
Reopen</button
Expand Down
1 change: 0 additions & 1 deletion boranga/frontend/boranga/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import 'select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.min.css';
import '@/../node_modules/datatables.net-bs5/css/dataTables.bootstrap5.min.css';
import '@/../node_modules/datatables.net-responsive-bs5/css/responsive.bootstrap5.min.css';
import '@/../node_modules/@fortawesome/fontawesome-free/css/all.min.css';
import '@/../node_modules/datatables.net-bs5/css/dataTables.bootstrap5.min.css';

extendMoment(moment);

Expand Down
6 changes: 3 additions & 3 deletions boranga/frontend/boranga/src/utils/vue/datatable.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template lang="html">
<div id="DataTable">
<div id="DataTable" class="table-responsive">
<table
:id="id"
class="hover table border table-striped table-bordered dt-responsive nowrap"
class="hover table border table-striped table-bordered dt-responsive nowrap w-100"
cellspacing="0"
width="100%"
style="width: 100%"
>
<thead>
<tr>
Expand Down
6 changes: 5 additions & 1 deletion boranga/frontend/boranga/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ export default defineConfig({
'@common-utils': path.resolve(__dirname, 'src/components/common/'),
},
},
esbuild: {
drop: ['console', 'debugger'],
minify: true,
},
build: {
manifest: 'manifest.json',
filenameHashing: false,
Expand All @@ -62,7 +66,7 @@ export default defineConfig({
`../../static/${applicationNameShort}_vue`
),
publicPath: `/static/${applicationNameShort}_vue/`,
sourcemap: true,
sourcemap: false,
rollupOptions: {
input: {
main: path.resolve(__dirname, 'src/main.js'),
Expand Down
10 changes: 5 additions & 5 deletions boranga/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
WSGI config for ledger project.
It exposes the WSGI callable as a module-level variable named ``application``.
"""

import os
from django.core.wsgi import get_wsgi_application
#from dj_static import Cling, MediaCling

import confy
from django.core.wsgi import get_wsgi_application

BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if os.path.exists(BASE_DIR+"/.env"):
confy.read_environment_file(BASE_DIR+"/.env")
if os.path.exists(BASE_DIR + "/.env"):
confy.read_environment_file(BASE_DIR + "/.env")
os.environ.setdefault("BASE_DIR", BASE_DIR)

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "boranga.settings")
#application = Cling(MediaCling(get_wsgi_application()))
application = get_wsgi_application()
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
git+https://github.com/dbca-wa/webtemplate2.git#egg=webtemplate_dbca
psycopg2-binary~=2.9
Django~=5.0.9
Django~=5.0.11
django-extensions~=3.2
ipython~=8.22
git+https://github.com/dbca-wa/ledger_api_client.git#egg=ledger_api_client
Expand Down
Loading