Merge pull request #534 from iMMAP/fix/choice_cdn_for_project_form

add choices js cdn
iMMAP · Jan 6, 2025 · 14bda26 · 14bda26
2 parents 1d1e587 + 7b0358b
commit 14bda26
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/docker/django/rh-tasks-cron b/docker/django/rh-tasks-cron
@@ -1,6 +1,6 @@
 0 2 * * * cd /home/ubuntu/rh && poetry run python src/manage.py dbbackup --database=default --settings=core.settings.production
 0 2 * * * cd /home/ubuntu/rh && poetry run python src/manage.py mediabackup --database=default --settings=core.settings.production
-*       * * * * (/home/ubuntu/rh/.venv/bin/python /home/ubuntu/rh/src/manage.py send_mail >> ~/cron_mail.log 2>&1)
-0,20,40 * * * * (/home/ubuntu/rh/.venv/bin/python /home/ubuntu/rh/src/manage.py retry_deferred >> ~/cron_mail_deferred.log 2>&1)
-0 0 * * * (/home/ubuntu/rh/.venv/bin/python /home/ubuntu/rh/src/manage.py purge_mail_log 7 >> ~/cron_mail_purge.log 2>&1)
+*       * * * * (/home/ubuntu/rh/.venv/bin/python /home/ubuntu/rh/src/manage.py send_mail --settings=core.settings.production >> ~/cron_mail.log 2>&1)
+0,20,40 * * * * (/home/ubuntu/rh/.venv/bin/python /home/ubuntu/rh/src/manage.py retry_deferred --settings=core.settings.production >> ~/cron_mail_deferred.log 2>&1)
+0 0 * * * (/home/ubuntu/rh/.venv/bin/python /home/ubuntu/rh/src/manage.py purge_mail_log 7 --settings=core.settings.production >> ~/cron_mail_purge.log 2>&1)
 # An empty line is required at the end of this file for a valid cron file.
diff --git a/docs/Models/management.md b/docs/Models/management.md
@@ -62,7 +62,7 @@ crontab -e
 
 Add the below to the cron
 ```shell
-*       * * * * (/home/ubuntu/rh/.venv/bin/python /home/ubuntu/rh/src/manage.py send_mail >> ~/cron_mail.log 2>&1)
-0,20,40 * * * * (/home/ubuntu/rh/.venv/bin/python /home/ubuntu/rh/src/manage.py retry_deferred >> ~/cron_mail_deferred.log 2>&1)
-0 0 * * * (/home/ubuntu/rh/.venv/bin/python /home/ubuntu/rh/src/manage.py purge_mail_log 7 >> ~/cron_mail_purge.log 2>&1)
-```
+*       * * * * (/home/ubuntu/rh/.venv/bin/python /home/ubuntu/rh/src/manage.py send_mail --settings=core.settings.production >> ~/cron_mail.log 2>&1)
+0,20,40 * * * * (/home/ubuntu/rh/.venv/bin/python /home/ubuntu/rh/src/manage.py retry_deferred --settings=core.settings.production >> ~/cron_mail_deferred.log 2>&1)
+0 0 * * * (/home/ubuntu/rh/.venv/bin/python /home/ubuntu/rh/src/manage.py purge_mail_log 7 --settings=core.settings.production >> ~/cron_mail_purge.log 2>&1)
+```
diff --git a/src/rh/templates/rh/projects/forms/project_form.html b/src/rh/templates/rh/projects/forms/project_form.html
@@ -220,10 +220,7 @@
     </div>
 {% endblock project_contents %}
 
-{% block project_form_scripts %}
-    <script src="{% static 'rh/project_planning.js' %}"></script>
-{% endblock project_form_scripts %}
-
 {% block scripts %}
     <script src="https://cdn.jsdelivr.net/npm/choices.js/public/assets/scripts/choices.min.js"></script>
-{% endblock scripts %}
+    <script src="{% static 'rh/project_planning.js' %}"></script>
+{% endblock scripts %}