Commit graph

1388 commits

Author SHA1 Message Date
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
Martin Pépin
e98a407982 Rename bits -> search_words in kfet.autocomplete
This is typo, this variable has not the same name in
`gestioncof.autocomplete` and `kfet.autocomplete`
2017-03-15 19:02:31 +00:00
Martin Pépin
84a39b41f2 Fix wrong email generation in _traitement_post (2)
I forgot to fix an email in commit c51379447. Now there are all
well-formed
2017-03-15 18:35:42 +00:00
Martin Pépin
c4edff717d Disable the fail_silently option for emails
It is obviously a bad idea to fail silently if something go wrong
when the connection with the mail server is being established. This was
enabled in the `_traitement_post` method.
2017-03-15 18:21:26 +00:00
Martin Pépin
c513794474 Fix wrong email generation in _traitement_post
The list `proposed_mails` is a list of elements of the kind
`(User, (mail_object, mail_body))` but it was handled as if it were
`(User, mail_body)` in the function `_traitement_post`.
2017-03-15 18:17:08 +00:00
Martin Pépin
98abe71681 Handle errors=None in _finalize_traitement
Sometimes the `errors` variable is `None` in `_finalize_traitement`.
It was not an issue when it was just used in the templates but now we
have to handle this in the view. Basically, we shall consider it is an
empty list when it occurs.
2017-03-15 11:59:41 +00:00
Martin Pépin
c37754376b Move registration_form to gestioncof/
The `registration` view was referencing this file using
`"gestioncof/registration_form.html"` whereas the `registration_post`
templated was referencing it in the global namespace
`"registration_form.html"`.

We choose the `gestioncof/` folder in order to avoid further conflicts
with other apps.
2017-03-15 11:40:52 +00:00
Hugo Roussille
f64a865de1 Côté serveur du catalogue des spectacles BdA 2017-03-15 07:37:24 +01:00
Qwann
d0938dfae7 Merge branch 'k-fet' into qwann/k-fet/category_addcost 2017-03-11 15:10:04 +01:00
Aurélien Delobelle
e6f0369874 Merge branch 'qwann/k-fet/home' into 'k-fet'
Qwann/k fet/home

### new features
Adding the menu on the K-Fêt home page.  Adding `hidden` attribute to Article for articles people don't want to have on the menu. The menu only show items with `is_sold = True` and `hidden = True`. 


See merge request !164
2017-03-11 13:26:56 +01:00
Qwann
ee6de35627 category addcost added 2017-03-10 18:29:15 +01:00
Qwann
5ddcd2f1ff Merge branch 'k-fet' into qwann/k-fet/home 2017-03-10 16:58:10 +01:00
Qwann
ca17e36b5a clean display for is_sold 2017-03-06 02:03:19 +01:00
Qwann
dcc19bd9e8 article.hidden in article & article_read 2017-03-06 01:58:33 +01:00
Aurélien Delobelle
fbd0d760b6 Merge branch 'Aufinal/command_interface' into 'k-fet'
Interfaces de commandes et d'inventaires
- Modifie la présentation de ces interfaces.
- Ajout de tooltips d'aide sur les colonnes.

fixes #140 

See merge request !170
2017-03-06 01:40:40 +01:00
Ludovic Stephan
8e31fae340 last tweaks 2017-03-05 21:29:20 -03:00
Ludovic Stephan
61e2fedb08 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/command_interface 2017-03-05 21:12:53 -03:00
Qwann
197da29366 css include added... 2017-03-05 20:05:35 +01:00
Qwann
b0b2210e93 Merge branch 'qwann/k-fet/home' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/home 2017-03-05 19:44:08 +01:00
Qwann
9f94262b82 removing inapropriate message 2017-03-05 19:43:26 +01:00
Qwann
f52aba8ca6 Merge branch 'k-fet' into qwann/k-fet/home 2017-03-05 19:21:20 +01:00
Aurélien Delobelle
95b129e396 resolved merge conflict in kfet views imports 2017-02-25 02:00:56 +01:00
Martin Pepin
a0a7be43e1 Merge branch 'Aufinal/fix_revente' into 'master'
Répare les boutons de transfert/réinitialisation de revente. Le problème
était dû à une mauvaise conversion `str` -> `int` de l'id de la revente 
et l'utilisation d'un formulaire Django élimine ce problème.

fixes #122

See merge request !172
2017-02-22 14:08:00 +01:00
Ludovic Stephan
42a93027d3 fix pep8 + move template 2017-02-21 19:49:29 -03:00
Ludovic Stephan
d96f4ead87 Revert "remove immediate mail"
This reverts commit 8953d3de07.
2017-02-16 09:55:19 -02:00
Ludovic Stephan
8953d3de07 remove immediate mail 2017-02-16 09:22:15 -02:00
Ludovic Stephan
d524d9286f better annulation check 2017-02-16 02:28:57 -02:00
Ludovic Stephan
d9402e1059 change resell and reinit forms 2017-02-16 01:52:44 -02:00
Evarin
ddbcfe0c69 JS commenté et plus propre 2017-02-15 22:25:26 +01:00
Evarin
0fcb29252b Frontend tout en JS 2017-02-15 21:01:54 +01:00
Qwann
46f343b1ab la K-Fêt se réveille à 7h 2017-02-15 14:44:58 +01:00
Qwann
1c90608f6d some cleaning 2017-02-15 14:21:00 +01:00
Martin Pépin
451fddaff0 Fix CI script
Finally, the old test database is destroyed before the build which
is simpler and makes more sense.
2017-02-13 17:43:10 +01:00
Martin Pépin
e8d21882fb Fix CI config
cleanup is not a stage by default, it has to be specified
2017-02-13 17:33:35 +01:00
Martin Pépin
85e593ddb8 Removes the test database if the build fails
Sometime the test database is not destroyed because the build is
interrupted by an uncaught error. This causes an error during the next
build.
2017-02-13 17:27:27 +01:00
Aurélien Delobelle
ef864cec32 Merge branch 'Aufinal/visibilite_stock' into 'k-fet'
K-Psul

Articles
- Ajout d'une surbrillance pour les articles dont le stock est bas
  (entre -5 et 5)

Panier
- Ajout d'indications de stocks sur chaque ligne (stock, warning visuel)
- Les ajouts/retraits d'articles déjà dans le panier mettent à jour la
  ligne associée à celui-ci déjà existante
- Les flèches haut/bas permettent de modifier la quantité d'un article

Fix #111

See merge request !133
2017-02-13 16:42:22 +01:00
Aurélien Delobelle
2e8fc45a1b Merge branch 'Aufinal/own_password' into 'k-fet'
Changement de son propre mot de passe

Permet à un K-Fêteux (disposant de la permission `kfet.is_team`) de modifier son propre mot de passe sur la page `account/XXX/edit`.

Accessoirement, la fonction `account_update` est maintenant conforme à PEP8.

Fix #121

See merge request !148
2017-02-13 16:32:40 +01:00
Ludovic Stephan
46e9e82da8 move account save 2017-02-13 12:19:47 -02:00
Qwann
9cae3ad0bd Merge branch 'k-fet' into qwann/k-fet/stats 2017-02-13 14:37:29 +01:00
Ludovic Stephan
83e41c292e css tweaks 2017-02-13 11:34:47 -02:00
Ludovic Stephan
43aab26530 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/visibilite_stock 2017-02-13 10:51:24 -02:00
Aurélien Delobelle
1a684471c2 Merge branch 'Aufinal/fix_amounts' into 'k-fet'
K-Psul:
- fix #163: different rounding for UKF accounts balances / UKF articles prices

See merge request !171
2017-02-13 08:25:13 +01:00
Ludovic Stephan
3fa0e4de6c different rounding for accounts 2017-02-12 19:05:41 -02:00
Ludovic Stephan
3dfd8bf616 interface for order_to_inventory 2017-02-12 18:04:50 -02:00
Martin Pépin
f5b23174de Fix test_database issue in bootstrap
The test database shouldn't be created manually
2017-02-12 17:39:30 +01:00
Martin Pépin
266a789d97 Merge branch 'Kerl/messages'
- Utilise une version à jour de jquery via un cdn
- Traite les messages
- Remplace les vieux simili-messages par des messages en utilisant le
  framework messages de Django
2017-02-12 16:47:44 +01:00
Ludovic Stephan
031b992fa3 fix brackets & lowstock indication 2017-02-12 11:09:03 -02:00
Ludovic Stephan
99d04fb75e bugfix 2017-02-12 11:02:54 -02:00
Aurélien Delobelle
4a5d9f880a Merge branch 'Aufinal/fix_amounts' into 'k-fet'
Corrige l'affichage du prix

!124 était overkill ; `amountToUKF` peut prendre en argument des valeurs positives ou négatives, et il me semble que le `round` ne sert quà corriger les erreurs de `float`, ce qui conduit à #128. Du coup, on revert une partie.

fixes #128

See merge request !163
2017-02-12 05:09:30 +01:00
Ludovic Stephan
db899a891b css tweaks 2017-02-12 02:03:41 -02:00