Ludovic Stephan
6797c92a1f
Ok ok je me rends
2017-04-01 09:35:37 -03:00
Ludovic Stephan
4af2562121
More clarity in argument names
2017-04-01 09:34:02 -03:00
Ludovic Stephan
29836fd15c
Remove deprecated option
2017-04-01 09:24:18 -03:00
Ludovic Stephan
e20ab2f352
Use set delete()
2017-04-01 09:18:40 -03:00
Ludovic Stephan
271654b447
No need for intermediate error reporting
2017-04-01 08:47:09 -03:00
Ludovic Stephan
ccf5f80685
Merge remote-tracking branch 'origin/master' into Aufinal/editions
2017-04-01 02:43:19 -03:00
Ludovic Stephan
8da832c1f7
Use nice authentication in orders too
2017-04-01 00:36:39 -03:00
Ludovic Stephan
063446efb5
Use columns for authentication and submit
2017-04-01 00:32:09 -03:00
Ludovic Stephan
cf03fba1cc
Remove whitespace by using elif
2017-03-31 23:54:38 -03:00
Ludovic Stephan
2774dbb5de
Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
2017-03-31 23:51:13 -03:00
Ludovic Stephan
7d93d91af9
Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles
2017-03-31 23:50:33 -03:00
Ludovic Stephan
9c9ad21d73
Add variable for article line
2017-03-31 23:46:10 -03:00
Ludovic Stephan
92fd94d1f9
Merge remote-tracking branch 'origin/master' into Aufinal/fix_stock_ws
2017-03-31 23:43:19 -03:00
Aurélien Delobelle
1286606f7a
Merge branch 'Aufinal/hotfix/liq_withdraw' into 'master'
...
K-Fêt :
- Empêche les retraits/charges sur LIQ
See merge request !205
2017-03-31 23:49:33 +02:00
Ludovic Stephan
aa29621c7c
Prevents special opes on LIQ
2017-03-31 18:28:03 -03:00
Ludovic Stephan
236dcb4644
Tweaks to UserDialog
2017-03-31 18:10:06 -03:00
Ludovic Stephan
582cdebaa1
Better callback management
2017-03-31 17:49:22 -03:00
Ludovic Stephan
ab15dbae76
Add handler management
2017-03-31 17:37:39 -03:00
Ludovic Stephan
38bfccf331
Change class name
2017-03-31 15:57:15 -03:00
Ludovic Stephan
8bf1bd5343
Websocket as member
2017-03-31 15:45:15 -03:00
Ludovic Stephan
413df0806d
Add url get method
2017-03-31 15:10:41 -03:00
Ludovic Stephan
49c84076de
Manage help_text and errors
2017-03-31 15:01:31 -03:00
Ludovic Stephan
1d8e084a19
websocket update when addcost
2017-03-31 14:37:00 -03:00
Ludovic Stephan
499c081565
Websocket class and instance
2017-03-31 12:23:27 -03:00
Ludovic Stephan
fdcd2e864c
Use widget_tweaks everywhere
2017-03-31 11:24:38 -03:00
Ludovic Stephan
530aafad19
Use widget_tweaks
2017-03-31 11:07:37 -03:00
Ludovic Stephan
6ac1241bd3
Listen to submit instead
2017-03-31 10:07:42 -03:00
Ludovic Stephan
50cb6e51a1
Use Set() natively
2017-03-31 10:06:02 -03:00
Ludovic Stephan
e54324e9f1
Use col-offset
2017-03-31 09:50:37 -03:00
Ludovic Stephan
ebf133d9af
Lowercase model verbose names
2017-03-30 21:38:16 -03:00
Ludovic Stephan
20561eb515
Idem for account_update
2017-03-30 21:31:16 -03:00
Ludovic Stephan
c1b8849cb8
Idem for supplier_form
2017-03-30 21:16:47 -03:00
Ludovic Stephan
91d5fe234c
Idem for checkoutstatements
2017-03-30 21:10:50 -03:00
Ludovic Stephan
8e65298c7c
Idem for article_update
2017-03-30 19:34:22 -03:00
Ludovic Stephan
079666c0db
Use verbose names and form snippets for article_create
2017-03-30 19:32:11 -03:00
Ludovic Stephan
0c21238391
Change misc field when updating
2017-03-30 18:39:13 -03:00
Ludovic Stephan
998838ca3e
Add update button
2017-03-30 13:31:16 -03:00
Ludovic Stephan
31888e33ce
simpler jquery selection
2017-03-30 13:30:55 -03:00
Ludovic Stephan
56b5fd6279
Always randomize supplier articles
2017-03-29 23:22:18 -03:00
Ludovic Stephan
95c59de4fc
Add supplier to dev data
2017-03-29 23:16:40 -03:00
Ludovic Stephan
eb7d436b90
Add "count finished" checkbox
2017-03-29 20:43:48 -03:00
Ludovic Stephan
ca6e120a38
Fix ws stock update
2017-03-29 09:43:10 -03:00
Ludovic Stephan
e6a1d16860
Websocket to manage possible kpsul conflicts
2017-03-29 00:58:47 -03:00
Ludovic Stephan
3b793dc726
Add first improvements for inventory
2017-03-28 23:47:41 -03:00
Ludovic Stephan
08c752f1b3
Simplify addcost management
2017-03-26 18:10:26 -03:00
Ludovic Stephan
5101400f64
Use callback_as_dict for addcost
2017-03-26 17:57:51 -03:00
Ludovic Stephan
c1f70d9d0a
Add capslock support for inputs
2017-03-26 17:51:55 -03:00
Ludovic Stephan
6d92df4155
Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/dialog_utils
2017-03-26 15:21:33 -03:00
Ludovic Stephan
946182f1fe
Simpler migration revert
2017-03-26 15:06:45 -03:00
Aurélien Delobelle
842f2cecc1
fix import, fix ope with addcost enabled, move Config location
2017-03-26 15:12:03 +02:00
Aurélien Delobelle
bc6ecda0c8
fix addcost kspul
2017-03-26 14:59:21 +02:00
Aurélien Delobelle
24f72ae7d4
add missing ;
2017-03-26 14:52:23 +02:00
Aurélien Delobelle
b81b33c056
allow chaining on container in display method
2017-03-26 14:51:16 +02:00
Aurélien Delobelle
485ae86a42
add update method to ModelObject
2017-03-26 14:46:46 +02:00
Ludovic Stephan
3bf7a066a2
Adapt history.html to new functions
2017-03-26 00:33:33 -03:00
Ludovic Stephan
3f07bf56fa
Remove console log
2017-03-26 00:25:51 -03:00
Ludovic Stephan
dbcfc6df46
Remove duplicate kfet.js import
2017-03-26 00:21:17 -03:00
Ludovic Stephan
87943ea7b9
Adapt kpsul to new functions
2017-03-26 00:20:47 -03:00
Ludovic Stephan
6be2f086df
Add generic functions for confirm dialogs
2017-03-26 00:20:28 -03:00
Ludovic Stephan
a1c976185c
Fix transfer sort
2017-03-25 13:44:35 -03:00
Ludovic Stephan
0997d85083
Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/refactor_history
2017-03-25 12:39:30 -03:00
Ludovic Stephan
5ff8f69bfa
Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/refactor_articles
2017-03-25 12:35:04 -03:00
Ludovic Stephan
06a89055c4
Simpler migration
2017-03-25 10:46:18 -03:00
Ludovic Stephan
9a081ddae0
PEP8 on Operation model
2017-03-25 10:43:02 -03:00
Ludovic Stephan
f645121fb1
Add error when editing LIQ
2017-03-25 10:39:53 -03:00
Ludovic Stephan
14e0d8090f
Add euros symbols
2017-03-25 10:01:35 -03:00
Ludovic Stephan
d8f572bb01
Remove group check in is_checkout
2017-03-25 09:57:44 -03:00
Ludovic Stephan
bc0affc038
Remove autocomplete leftovers
2017-03-25 09:56:36 -03:00
Aurélien Delobelle
ae82c34023
add missing migration
2017-03-25 11:21:21 +01:00
Aurélien Delobelle
215d4a63ad
Merge branch 'Aufinal/create_opes' into 'master'
...
K-Fêt - Dev :
- new command - createopes: Création d'opérations et transferts aléatoires
See merge request !193
2017-03-25 11:08:22 +01:00
Aurélien Delobelle
6afbcb44a1
delete array comprehesion
2017-03-25 10:26:45 +01:00
Aurélien Delobelle
967748ded3
details link to read instead of update
...
- It was the old behaviour.
2017-03-25 09:58:20 +01:00
Aurélien Delobelle
72970c6be7
Fix api call on new transfers
...
- Use django-js-reverse
- Replace old url (deleted) with standard url
2017-03-25 09:44:55 +01:00
Ludovic Stephan
aa6a50a6e7
Simplify JS-Python interface for cancel_ops
2017-03-24 23:57:27 -03:00
Ludovic Stephan
794527772f
Add more explicit migration name
2017-03-24 23:41:33 -03:00
Ludovic Stephan
5f3f044084
Add revert function to migration
2017-03-24 23:27:55 -03:00
Ludovic Stephan
608e67fe6a
Add RunPython script to migration
2017-03-24 21:23:04 -03:00
Ludovic Stephan
44fbc92893
Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/editions
2017-03-24 21:07:32 -03:00
Ludovic Stephan
d7740e66fe
adapt code to is_checkout removal
2017-03-24 20:52:49 -03:00
Ludovic Stephan
cadaf43131
Remove is_checkout field from Operation model
2017-03-24 18:50:57 -03:00
Aurélien Delobelle
ac18cbd9d9
fix by on last statement
2017-03-24 22:10:34 +01:00
Aurélien Delobelle
0d02d47d33
move utils functions
2017-03-24 22:05:04 +01:00
Aurélien Delobelle
2e3bd5bd7a
fix search box
2017-03-24 21:41:34 +01:00
Aurélien Delobelle
abce961d91
use django-js-reverse
2017-03-24 21:28:33 +01:00
Aurélien Delobelle
a9d1a6aae9
clean array iteration
2017-03-24 21:24:06 +01:00
Aurélien Delobelle
f063c3470c
Merge branch 'Aufinal/fix_password_freeze' into 'master'
...
K-Psul:
- fix freeze when no-team password
Closes #153
See merge request !196
2017-03-24 20:53:44 +01:00
Aurélien Delobelle
ff5959638b
fix missing bracket
2017-03-24 20:32:04 +01:00
Aurélien Delobelle
cb13280458
Merge branch 'master' into 'Aufinal/merge_k-fet'
...
# Conflicts:
# kfet/static/kfet/css/index.css
2017-03-24 20:23:32 +01:00
Ludovic Stephan
7520effe53
Fix K-Psul freeze when no-team password
...
L'erreur 403 est renvoyée dans ce cas par le décorateur
`@teamkfet_required`, donc sans data associé, ce qui faisait buguer
`getErrorsHtml`. On rajoute donc le cas correspondant.
2017-03-24 15:45:47 -03:00
Martin Pepin
33b3d558b5
Merge branch 'Aufinal/decorators' into 'master'
...
Utilise les bons décorateurs
See merge request !195
2017-03-21 00:25:50 +01:00
Ludovic Stephan
5e802217fd
Remove lambda operators
2017-03-20 20:24:44 -03:00
Ludovic Stephan
dd4d1f3061
Improves creation efficiency
2017-03-20 20:19:04 -03:00
Ludovic Stephan
aa247b465a
Fix search box (hackish)
2017-03-20 19:08:48 -03:00
Martin Pepin
ae38b5d1e7
Merge branch 'hotfix/prevent_ldap_injection' into 'master'
...
Hotfix/prevent ldap injection
Closes #150
See merge request !188
2017-03-20 23:06:59 +01:00
Martin Pépin
59f57793ba
typo
2017-03-20 22:05:48 +00:00
Martin Pépin
0aed975615
Fix the empty-query test in autocomplete
...
If there is no valid word to search in the LDAP database, no query is
performed. Since 74f0b63e
2017-03-20 08:14:20 +00:00
Ludovic Stephan
6d36d50e9a
Fix 'at' property for transfergroups
2017-03-20 01:56:59 -03:00
Ludovic Stephan
1fcd53d780
Continue renaming node.type to node.modelname
2017-03-20 00:42:12 -03:00
Ludovic Stephan
fe965875f7
Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
2017-03-20 00:33:30 -03:00
Ludovic Stephan
3465dd7045
Change node.type to node.modelname for clarity
2017-03-20 00:26:11 -03:00
Ludovic Stephan
2c63e6b667
Use django.contrib.auth decorators
2017-03-20 00:11:50 -03:00
Ludovic Stephan
36dc6439a8
Plug createopes into loadkfetdevdata
2017-03-19 16:03:39 -03:00
Ludovic Stephan
0356ec34ae
Add createopes command
2017-03-19 16:03:19 -03:00
Martin Pépin
74f0b63e96
Change ldap query behaviour if multiple inputs
...
It is now consistent with the other lookups over the User database
2017-03-19 15:10:08 +00:00
Martin Pépin
dc50a23b10
Escape the content of the regex in highligh_text
2017-03-19 14:48:04 +00:00
Martin Pépin
4899bba1f7
Replace list comprehensions by iterators in dal
2017-03-19 14:05:25 +00:00
Ludovic Stephan
c99e4f26d0
Move history initialisation as Config.reset callback
2017-03-19 04:59:55 +01:00
Ludovic Stephan
66c5a6953c
Improve websocket filter for special history pages
2017-03-19 04:29:54 +01:00
Ludovic Stephan
7a00096170
Add support for account_read history
2017-03-18 22:48:50 -03:00
Ludovic Stephan
951932a6c8
Add support and websocket to transfers.html
2017-03-18 22:35:47 -03:00
Ludovic Stephan
fa64a68378
Add strict mode to history.html script
2017-03-18 22:15:09 -03:00
Ludovic Stephan
fc3e86aea6
Add websocket support to ArticleManager
2017-03-18 22:06:30 -03:00
Ludovic Stephan
51fba4da21
Log messages
2017-03-18 19:02:08 -03:00
Ludovic Stephan
47b7d934e0
PEP8 on imports
2017-03-18 19:01:51 -03:00
Ludovic Stephan
29d7654052
Root kfet account
2017-03-18 18:02:33 -03:00
Ludovic Stephan
f512c1bdd7
Add better checkout creation
2017-03-18 18:02:23 -03:00
Ludovic Stephan
b8a307b4a6
Add support for kfet/history page
2017-03-18 14:05:11 -03:00
Ludovic Stephan
1d532616b7
Fix bugs introduced by previous commit
2017-03-18 02:47:30 -03:00
Ludovic Stephan
9e905b0f8b
Remove kpsul dependence from history (oops)
2017-03-18 02:40:34 -03:00
Ludovic Stephan
644b08973a
Add websocket support for history
2017-03-18 02:32:27 -03:00
Ludovic Stephan
34bb680570
Add History equivalent functions
2017-03-18 02:31:52 -03:00
Ludovic Stephan
b655907bd4
Add history to KPsul manager
2017-03-18 02:29:02 -03:00
Ludovic Stephan
14b922634d
Remove deprecated history functions
2017-03-18 02:28:01 -03:00
Ludovic Stephan
5c9c206f68
Adapt css to new canceled syntax
2017-03-18 02:25:44 -03:00
Ludovic Stephan
b0b1fdf936
Add jsdoc comments to history models
2017-03-17 21:00:58 -03:00
Ludovic Stephan
565a054323
Add support for low stock css
2017-03-17 17:30:22 -03:00
Ludovic Stephan
58c57c6f89
Add hierarchy of needed models, w/ formatters
2017-03-17 16:00:49 -03:00
Ludovic Stephan
47fe74fbb0
template specification
2017-03-17 15:59:52 -03:00
Ludovic Stephan
df0ea96b41
Adapt history_json return value to ModelForest standards
2017-03-17 15:59:21 -03:00
Qwann
de724a2c0d
PEP8 for perform_operation
2017-03-17 19:53:23 +01:00
Qwann
a107fa0309
migration renamed
2017-03-17 19:23:44 +01:00
Qwann
fcc2ab8810
frontend working
2017-03-17 19:17:36 +01:00
Ludovic Stephan
53f89f53e0
Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
2017-03-17 12:34:48 -03:00
Ludovic Stephan
a7de396aa3
Better comparison control
2017-03-17 12:33:43 -03:00
Ludovic Stephan
11603cee69
Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
2017-03-17 00:19:45 -03:00
Ludovic Stephan
9ab2a11432
Finish adapting ArticleManager and Autocomplete
2017-03-16 22:26:59 -03:00
Ludovic Stephan
91f14deda1
last tweaks and doc
2017-03-16 22:26:30 -03:00
Ludovic Stephan
1c5ac561a3
Change article table into divs
2017-03-16 22:26:08 -03:00
Ludovic Stephan
f0a80561ed
Add article display to Config callback
2017-03-16 22:24:57 -03:00
Martin Pépin
55b67f38c8
Notice the users about the α-numeric restriction
...
Add a help text above the two autocompletion inputs letting the users
know that non-alphanumeric characters will not be used.
2017-03-16 23:16:56 +00:00
Martin Pépin
741f0183e6
Prevent ldap injections in autocompletion views
...
We only allow alphanumeric characters in the query in order to avoid
injections
2017-03-16 22:43:43 +00:00
Ludovic Stephan
01295d464d
Adapt ArticleAutocomplete to new format
2017-03-16 01:22:46 -03:00
Ludovic Stephan
2ce96bce1b
Add traverse function to ModelTree
2017-03-16 01:21:50 -03:00
Ludovic Stephan
770c185bd0
Modify sort in ModelTree
2017-03-16 01:21:18 -03:00
Ludovic Stephan
3d76079439
Add correct syntax to category data
2017-03-16 01:20:06 -03:00
Ludovic Stephan
3793863bab
Merge remote-tracking branch 'origin/k-fet' into Aufinal/merge_k-fet
2017-03-15 22:58:54 -03:00
Ludovic Stephan
08d1521d81
Adapt ArticleManagerto new API
2017-03-15 22:40:06 -03:00
Ludovic Stephan
fe6823fc7b
Adapt article_data return value to ModelTree standards
2017-03-15 22:39:30 -03:00
Ludovic Stephan
1570d9f494
Polish ModelForest class
2017-03-15 22:10:56 -03:00
Martin Pépin
3acc8bca75
s/username/clipper in highlight_clipper
...
There was typo, the `Clipper` object has no `username` attribute. We
want to use the `clipper` attribute
2017-03-15 19:11:38 +00:00
