DGNum/gestioCOF
15
2
Fork 2
Code Issues 79 Pull requests 21 Projects Releases 12 Packages Wiki Activity

WIP: Aureplop/kpsul js refactor #501

Draft
delobell wants to merge 215 commits from aureplop/kpsul_js_refactor into master
pull from: aureplop/kpsul_js_refactor
merge into: DGNum:master
Conversation 55 Commits 215 Files changed 19 +9 -1
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f4cb1e2e83 - Show all commits

3
kfet/static/kfet/js/history.js
View file

@ -113,6 +113,9 @@ class KHistory {
if (options.transfersonly && opegroup.constructor.verbose_name == 'opegroup') if (options.transfersonly && opegroup.constructor.verbose_name == 'opegroup')
return false; return false;
if (options.opesonly && opegroup.constructor.verbose_name == 'transfergroup')
return false;
if (options.accounts && options.accounts.length && if (options.accounts && options.accounts.length &&
options.accounts.indexOf(opegroup.account_id) < 0) options.accounts.indexOf(opegroup.account_id) < 0)
return false; return false;

4
kfet/static/kfet/js/kpsul.js
View file

@ -12,7 +12,9 @@ class KPsulManager {
this.account_manager = new AccountManager(this); this.account_manager = new AccountManager(this);
this.checkout_manager = new CheckoutManager(this); this.checkout_manager = new CheckoutManager(this);
this.article_manager = new ArticleManager(this); this.article_manager = new ArticleManager(this);
this.history = new KHistory(); this.history = new KHistory({
api_options: {'opesonly': true},
});
this._init_events(); this._init_events();
} }

3
kfet/views.py
View file

@ -1468,6 +1468,7 @@ def history_json(request):
checkouts = request.GET.getlist('checkouts[]', None) checkouts = request.GET.getlist('checkouts[]', None)
accounts = request.GET.getlist('accounts[]', None) accounts = request.GET.getlist('accounts[]', None)
transfers_only = request.GET.get('transfersonly', None) transfers_only = request.GET.get('transfersonly', None)
opes_only = request.GET.get('opesonly', None)
# Un non-membre de l'équipe n'a que accès à son historique # Un non-membre de l'équipe n'a que accès à son historique
if not request.user.has_perm('kfet.is_team'): if not request.user.has_perm('kfet.is_team'):
@ -1525,6 +1526,8 @@ def history_json(request):
transfergroups = TransferGroup.objects.none() transfergroups = TransferGroup.objects.none()
if transfers_only: if transfers_only:
opegroups = OperationGroup.objects.none() opegroups = OperationGroup.objects.none()
if opes_only:
transfergroups = TransferGroup.objects.none()
if accounts: if accounts:
opegroups = opegroups.filter(on_acc_id__in=accounts) opegroups = opegroups.filter(on_acc_id__in=accounts)