blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-16 22:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed flickering popup massage preventing approving AFTER withdrawing a rejection

Browse Source 
This happened because of a conflict between HTML forms native submit behaviour
(automatically refreshing page) and our javascripts submit onclick functions.
Now fixed by setting event.preventDefault() within the js functions.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
This commit is contained in:
Cris
2021-02-18 13:56:15 +01:00
committed by cris-technikum
parent 6d3407c309
commit 4b3cf019c3
4 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/lehre/anrechnung/approveAnrechnungDetail.js
+12
View File
@@ -43,6 +43,9 @@ $(function(){
// Approve Anrechnungen
$("#approveAnrechnungDetail-approve-anrechnung-confirm").click(function(){
// Avoid form redirecting automatically
event.preventDefault();
// Get form data
let form_data = $('form').serializeArray();
@@ -160,6 +163,9 @@ $(function(){
// Request Recommendation for Anrechnungen
$("#approveAnrechnungDetail-request-recommendation").click(function(){
// Avoid form redirecting automatically
event.preventDefault();
// Get form data
let form_data = $('form').serializeArray();
@@ -202,6 +208,9 @@ $(function(){
// Request Recommendation for Anrechnungen
$("#approveAnrechnungDetail-withdraw-anrechnung-approvement").click(function(){
// Avoid form redirecting automatically
event.preventDefault();
if(!confirm(FHC_PhrasesLib.t("anrechnung", "genehmigungAblehnungWirklichZuruecknehmen")))
{
return;
@@ -221,14 +230,17 @@ $(function(){
{
successCallback: function (data, textStatus, jqXHR)
{
console.log(data);
if (data.error && data.retval != null)
{
console.log('inside error');
// Print error message
FHC_DialogLib.alertWarning(data.retval);
}
if (!data.error && data.retval != null)
{
console.log('inside success');
approveAnrechnungDetail.formatGenehmigungIsWithdrawed(
data.retval.status_bezeichnung
);
public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+7
View File
@@ -223,6 +223,9 @@ $(function(){
// Approve Anrechnungen
$("#approveAnrechnungUebersicht-approve-anrechnungen-confirm").click(function(){
// Avoid form redirecting automatically
event.preventDefault();
// Get selected rows data
let selected_data = $('#tableWidgetTabulator').tabulator('getSelectedData')
.map(function(data){
@@ -362,6 +365,10 @@ $(function(){
// Request Recommendation for Anrechnungen
$("#approveAnrechnungUebersicht-request-recommendation").click(function(){
// Avoid form redirecting automatically
event.preventDefault();
// Get selected rows data
let selected_data = $('#tableWidgetTabulator').tabulator('getSelectedData');
public/js/lehre/anrechnung/reviewAnrechnungDetail.js
+3
View File
@@ -49,6 +49,9 @@ $(function(){
// Recommend Anrechnung
$("#reviewAnrechnungDetail-recommend-anrechnung-confirm").click(function(){
// Avoid form redirecting automatically
event.preventDefault();
// Get form data
let form_data = $('form').serializeArray();
public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
+3
View File
@@ -221,6 +221,9 @@ $(function(){
// Recommend Anrechnungen
$("#reviewAnrechnungUebersicht-recommend-anrechnungen-confirm").click(function(){
// Avoid form redirecting automatically
event.preventDefault();
// Get selected rows data
let selected_data = $('#tableWidgetTabulator').tabulator('getSelectedData')
.map(function(data){