Aurélien Delobelle
0815c96c1c
Merge branch 'Kerl/postgres' into 'master'
...
Préparation au passage à postgres
- Suppression du champ num du modèle CofProfile.
- Suppression des LOCK (spécifique MySQL).
- Le code devient compatible avec tous les backends supportés par Django.
- Suppressions de code servant à la compatibilité python2.
- Corrige le message de succès à la fin de l'inscription. Celui-ci ne prenait pas en compte le statut is_cof à jour du profil.
See merge request !234
2017-05-23 22:50:10 +02:00
Martin Pépin
3a69c3371f
Simple test: we can query the account-read page
2017-05-23 20:38:53 +01:00
Martin Pépin
74135f8877
enhance User.__str__ with get_full_name
2017-05-23 16:50:43 +01:00
Martin Pepin
92c946a286
Merge branch 'aureplop/clean_perms' into 'master'
...
Clean K-Fêt permissions
See merge request !235
2017-05-23 17:40:58 +02:00
Aurélien Delobelle
1d269ef4f9
Update migration to keep perms.
...
If content type for old kfet.GlobalPermissions exists:
- custom permissions related to this content type are updated to new content types,
- then we can safely remove this content type.
2017-05-23 16:48:33 +02:00
Aurélien Delobelle
cd5a2e0591
Move K-Fêt global permissions.
2017-05-23 13:47:40 +02:00
Martin Pépin
3c8f1c58c5
Use transaction.atomic instead of lock_table
...
lock_table used LOCK which is mysql-specific
2017-05-23 05:58:09 +01:00
Martin Pépin
f0f1585661
Registration: remove success var, fix message
...
`member.profile` was not up-to-date where we used to send the success
message => move it to the place where the success var is set tu `True`
and remove the success var was which becomes irrelevant.
2017-05-23 05:41:57 +01:00
Aurélien Delobelle
a36d002b17
Merge branch 'Kerl/apt_upgrade' into 'master'
...
Upgrade apt packages while provisioning
See merge request !233
2017-05-22 15:08:16 +02:00
Martin Pépin
3762b38afe
Remove useless pip upgrade in bootstrap.sh
2017-05-22 10:29:38 +01:00
Martin Pépin
dba8a0a857
Remove the num field in CofProfile
2017-05-22 01:00:32 +01:00
Martin Pépin
76dcaf7d51
drop py2 compat
2017-05-21 23:58:44 +01:00
Martin Pépin
17b140fb12
Upgrade apt packages while provisioning
2017-05-21 18:42:30 +01:00
Aurélien Delobelle
e60e347a53
Add base templates to extend
...
- kfet/base_col_1.html for one column content.
- kfet/base_col_2.html for two columns content (left for fixed content,
right for main content).
2017-05-20 13:57:21 +02:00
Aurélien Delobelle
1845ce825f
jpp
...
Fixes #90
2017-05-19 20:13:36 +02:00
Aurélien Delobelle
109a692cea
Order creation improvements.
...
- colspan takes into account the scale length.
- add box_capacity
2017-05-19 17:55:31 +02:00
Aurélien Delobelle
c0b8430a12
Better scale management for order creation
...
+ Extends labels formatting of scale.
2017-05-19 17:40:06 +02:00
Aurélien Delobelle
c11c3f84ed
clean big tables forms
2017-05-19 16:42:26 +02:00
Aurélien Delobelle
4344b7d537
chrome support
2017-05-19 15:13:27 +02:00
Aurélien Delobelle
0995f712ca
clean hover/focus/disabled btn
2017-05-19 14:48:57 +02:00
Aurélien Delobelle
ecce2fda21
Merge branch 'master' into aureplop/clean_scroll
2017-05-19 14:08:57 +02:00
Aurélien Delobelle
51dca32d05
shorter transitions
2017-05-19 14:01:13 +02:00
Aurélien Delobelle
ae27065626
Group permissions select multiple -> checkboxes
...
- Add handler for CheckboxSelectMultiple in form_field_snippet.html.
- Add template filter "widget_type" to get widget class name.
- Group permissions selection becomes easier.
2017-05-19 13:42:41 +02:00
Aurélien Delobelle
e9073e2265
Improve multiple select inputs
...
+ Group edition form gains success message, is prettier
+ Fix: K-Fêt prefix for group name on this form
2017-05-18 21:41:23 +02:00
Aurélien Delobelle
1a661c1fd3
revert
2017-05-18 20:29:29 +02:00
Aurélien Delobelle
5776c81764
Clean navbar + content_center only
...
- Add css transitions on buttons + navbar links.
- Clean css of navbar.
- Clean templates with only centered form/content.
- Page opened when login as generic team user close itself (only for
non-CAS users).
- A message is added when generic team user connects.
- Fix extra space on right when messages are prompted.
2017-05-18 20:17:05 +02:00
Aurélien Delobelle
95a8b484e0
Merge branch 'Aufinal/fix_history' into 'master'
...
Fix asynchronous calls with resetSettings
See merge request !229
2017-05-15 23:43:28 +02:00
Ludovic Stephan
647b32e727
Move displayAddcost function
2017-05-15 17:52:49 -03:00
Martin Pepin
6871945dcd
Merge branch 'aureplop/fix_perms' into 'master'
...
Fix UserGroupForm
Closes #161
See merge request !228
2017-05-15 11:29:33 +02:00
Ludovic Stephan
bf0e345301
Fix asynchronous calls with resetSettings
...
The `resetSettings` function now returns the ajax object, allowing to
chain other calls to it, e.g. the `getHistory` function.
2017-05-14 23:50:09 -03:00
Aurélien Delobelle
e0b1db1e1e
more robust tests
2017-05-14 22:19:25 +02:00
Martin Pepin
5d8427e601
Merge branch 'aureplop/fewer_requests' into 'master'
...
Moins de requêtes
See merge request !217
2017-05-12 21:13:35 +02:00
Aurélien Delobelle
4ac7b30bdd
Fix UserGroupForm + tests for this form.
...
- Non-K-Fêt group membership is no longer erased by the account edit
form.
- Add some tests to ensure proposed choices in this form corresponds to
K-Fêt groups + test case for #161 .
Fixes #161
2017-05-12 16:55:18 +02:00
Aurélien Delobelle
b1e46792c8
(little) cleaning of order_create view
2017-05-10 13:11:47 +02:00
Aurélien Delobelle
b0e7ebfbc5
fix typo + pep8 + del future imports
2017-05-10 12:49:14 +02:00
Aurélien Delobelle
6cdb791989
fix class name conflicts
2017-05-10 12:39:56 +02:00
Aurélien Delobelle
e7266e7a9d
use new settings for redis
2017-04-26 11:28:18 +02:00
Aurélien Delobelle
673dc0295d
Merge branch 'master' into aureplop/fix_cache
2017-04-26 11:22:29 +02:00
Aurélien Delobelle
4ed5128829
Merge branch 'Kerl/settings2' into 'master'
...
Add settings for redis and fix settings handling in the provisioning script
See merge request !227
2017-04-26 11:19:44 +02:00
Martin Pépin
fb4258f821
Set the redis passwd properly in bootstrap.sh
2017-04-25 20:23:51 +01:00
Martin Pépin
dbff7740c8
Add REDIS_PORT to the settings and secrets
2017-04-25 20:23:21 +01:00
Ludovic Stephan
5c5fc6da1b
Merge branch 'aureplop/less_prices_history' into 'master'
...
Less articles prices history
Closes #142
See merge request !224
2017-04-25 14:32:18 +02:00
Martin Pépin
52d9979d7c
Fix settings in the provisioning script
2017-04-24 22:17:41 +01:00
Martin Pépin
2aee43e01a
Add more configuration options for redis
...
- `REDIS_HOST` can be specified in the secrets
- Two new secrets: `REDIS_PASSWD` and `REDIS_DB`
2017-04-24 22:17:41 +01:00
Aurélien Delobelle
739990cdb6
Add total boxes to new inventory view + fix/clean
...
- Add total boxes in cellar and bar to new inventory view.
- On this view, table is "minified".
- Revert background color for some templates.
- Clean some margin (responsively).
- Clean tab pills on account read.
2017-04-22 01:17:23 +02:00
Aurélien Delobelle
6de0844d28
Merge branch 'master' into aureplop/clean_scroll
2017-04-21 22:28:22 +02:00
Aurélien Delobelle
0d8a613f28
improve bda inscription form/view code
2017-04-21 18:22:53 +02:00
Aurélien Delobelle
2eee8f58aa
Merge branch 'master' into aureplop/fewer_requests
2017-04-17 20:45:01 +02:00
Aurélien Delobelle
8622002e8d
minor change
2017-04-17 20:40:54 +02:00
Aurélien Delobelle
dbf5844f6a
Clean settings redis
2017-04-15 14:41:55 +02:00