ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-25 03:30:30 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 'tranfer_front'

Browse Source 
# Conflicts:
#   apps/activity/views.py
#   apps/permission/backends.py
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
#   static/js/base.js
#   templates/base.html
#   templates/member/user_list.html
This commit is contained in:
ynerant
2020-05-07 18:48:35 +02:00
parent 72642d470c 138bdbd444
commit 395c52220f
113 changed files with 10399 additions and 2120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
static/colorfield/colorfield.js Normal file
View File

@ -0,0 +1,12 @@
/** global: django */
window.onload = function() {
if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined') {
(function($) {
// add colopicker to inlines added dynamically
$(document).on('formset:added', function onFormsetAdded(event, row) {
jscolor.installByClassName('jscolor');
});
}(django.jQuery));
}
};

1855
static/colorfield/jscolor/jscolor.js Executable file
View File

File diff suppressed because it is too large Load Diff

1
static/colorfield/jscolor/jscolor.min.js vendored Executable file
View File

File diff suppressed because one or more lines are too long

2
static/js/autocomplete_model.js
View File

@ -11,7 +11,7 @@ $(document).ready(function () {
name_field = "name";
let input = target.val();
$.getJSON(api_url + "?format=json&search=^" + input + api_url_suffix, function(objects) {
$.getJSON(api_url + (api_url.includes("?") ? "&" : "?") + "format=json&search=^" + input + api_url_suffix, function(objects) {
let html = "";
objects.results.forEach(function (obj) {

9
static/js/base.js
View File

@ -335,14 +335,7 @@ function autoCompleteNote(field_id, note_list_id, notes, notes_display, alias_pr
})
});
});// end getJSON alias
});
}// end function autocomplete
// When a validate button is clicked, we switch the validation status
function de_validate(id, validated) {
let invalidity_reason = $("#invalidity_reason_" + id).val();
$("#validate_" + id).html("<strong style=\"font-size: 16pt;\">⟳ ...</strong>");
$("#validate_" + id).html("<i class='fa fa-spinner'></i>");
// Perform a PATCH request to the API in order to update the transaction
// If the user has insufficient rights, an error message will appear