bugfix for API selects (#780)

This commit is contained in:
Kevin Papst
2019-05-12 17:22:24 +02:00
committed by GitHub
parent 5c227888f2
commit 392f8239f5
15 changed files with 1667 additions and 1118 deletions

View File

@@ -18,7 +18,7 @@ export default class KimaiAPI extends KimaiPlugin {
return 'api';
}
get(url, data, callback) {
get(url, data, callbackSuccess, callbackError) {
jQuery.ajax({
url: url,
headers: {
@@ -28,11 +28,12 @@ export default class KimaiAPI extends KimaiPlugin {
method: 'GET',
data: data,
dataType: 'json',
success: callback
success: callbackSuccess,
error: callbackError
});
}
patch(url, callbackSuccess, callbackError) {
patch(url, data, callbackSuccess, callbackError) {
jQuery.ajax({
url: url,
headers: {
@@ -40,6 +41,7 @@ export default class KimaiAPI extends KimaiPlugin {
'Content-Type':'application/json'
},
method: 'PATCH',
data: data,
dataType: 'json',
success: callbackSuccess,
error: callbackError

View File

@@ -59,7 +59,7 @@ export default class KimaiAPILink extends KimaiClickHandlerReducedInTableRow {
{
const method = attributes['method'];
const eventName = attributes['event'];
const api = this.getContainer().getPlugin('api');
const API = this.getContainer().getPlugin('api');
const eventing = this.getContainer().getPlugin('event');
const alert = this.getContainer().getPlugin('alert');
const successHandle = function(result) {
@@ -80,9 +80,9 @@ export default class KimaiAPILink extends KimaiClickHandlerReducedInTableRow {
};
if (method === 'PATCH') {
api.patch(url, successHandle, errorHandle);
API.patch(url, {}, successHandle, errorHandle);
} else if (method === 'DELETE') {
api.delete(url, successHandle, errorHandle);
API.delete(url, successHandle, errorHandle);
}
}

View File

@@ -103,9 +103,9 @@ export default class KimaiActiveRecords extends KimaiPlugin {
reloadActiveRecords() {
const self = this;
const apiService = this.getContainer().getPlugin('api');
const API= this.getContainer().getPlugin('api');
apiService.get(this.attributes['api'], {}, function(result) {
API.get(this.attributes['api'], {}, function(result) {
self.setEntries(result);
});
}

View File

@@ -39,6 +39,7 @@ export default class KimaiAutocomplete extends KimaiPlugin {
{
const apiUrl = jQuery(selector).attr('data-autocomplete-url');
const self = this;
const API = self.getContainer().getPlugin('api');
jQuery(selector)
// don't navigate away from the field on tab when selecting an item
@@ -51,7 +52,7 @@ export default class KimaiAutocomplete extends KimaiPlugin {
.autocomplete({
source: function (request, response) {
const lastEntry = self.extractLastTag(request.term);
self.getContainer().getPlugin('api').get(apiUrl, {'name': lastEntry}, function(data){
API.get(apiUrl, {'name': lastEntry}, function(data){
response(data);
});
},

View File

@@ -72,9 +72,9 @@ export default class KimaiRecentActivities extends KimaiPlugin {
reloadRecentActivities() {
const self = this;
const apiService = this.getContainer().getPlugin('api');
const API = this.getContainer().getPlugin('api');
apiService.get(this.attributes['api'], {}, function(result) {
API.get(this.attributes['api'], {}, function(result) {
self.setEntries(result);
});
}

View File

@@ -51,7 +51,7 @@ export default class KimaiSelectDataAPI extends KimaiPlugin {
jQuery(targetSelect).removeAttr('disabled');
API.get(apiUrl, function(data){
API.get(apiUrl, {}, function(data){
self._updateSelect(targetSelect, data);
});
});