Rebuild JS and some switch stuff for #3826

This commit is contained in:
James Cole 2020-09-30 17:28:16 +02:00
parent f82e35a8a8
commit 564a387505
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
5 changed files with 15 additions and 3 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -401,6 +401,9 @@ export default {
// console.log(window.expectedSourceTypes.source[this.ucFirst(transaction.type)]);
// console.log('destination allowed types for a ' + transaction.type);
// console.log(window.expectedSourceTypes.destination[this.ucFirst(transaction.type)]);
if(typeof window.expectedSourceTypes === 'undefined') {
console.error('window.expectedSourceTypes is unexpectedly empty.')
}
this.transactions.push({
transaction_journal_id: transaction.transaction_journal_id,

View File

@ -172,6 +172,8 @@
{# Java libraries and stuff: #}
{% block definitions %}{% endblock %}
{# Moment JS #}
<script src="v1/js/lib/moment.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
<script src="v1/js/ff/moment/{{ language }}.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
@ -205,6 +207,7 @@
<script type="text/javascript" src="v1/lib/intro/intro.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/intro/intro.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endif %}
{% block scripts %}{% endblock %}
{% if config('firefly.tracker_site_id') != '' and config('firefly.tracker_url') != '' %}

View File

@ -7,7 +7,9 @@
{% block content %}
<div id="edit_transaction"></div>
{% endblock %}
{% block scripts %}
{% block definitions %}
<script type="text/javascript" nonce="{{ JS_NONCE }}">
var allowedOpposingTypes = {{ allowedOpposingTypes|json_encode|raw }};
var accountToTypes = {{ accountToTypes|json_encode|raw }};
@ -18,5 +20,9 @@
var previousUri = '{{ previousUri }}';
</script>
{% endblock %}
{% block scripts %}
{% endblock %}
{% block styles %}
{% endblock %}