forked from ScoDoc/ScoDoc
update
This commit is contained in:
commit
518b9c049c
@ -157,7 +157,7 @@ Sur une machine de DEV, lancer
|
|||||||
|
|
||||||
flask profile --host 0.0.0.0 --length 32 --profile-dir /opt/scodoc-data
|
flask profile --host 0.0.0.0 --length 32 --profile-dir /opt/scodoc-data
|
||||||
|
|
||||||
le fichier `.prof` sera alors écrit dans `/opt/scoidoc-data` (on peut aussi utiliser `/tmp`).
|
le fichier `.prof` sera alors écrit dans `/opt/scodoc-data` (on peut aussi utiliser `/tmp`).
|
||||||
|
|
||||||
Pour la visualisation, [snakeviz](https://jiffyclub.github.io/snakeviz/) est bien:
|
Pour la visualisation, [snakeviz](https://jiffyclub.github.io/snakeviz/) est bien:
|
||||||
|
|
||||||
|
@ -46,9 +46,9 @@
|
|||||||
# sco_cache.NotesTableCache.delete_many(formsemestre_id_list)
|
# sco_cache.NotesTableCache.delete_many(formsemestre_id_list)
|
||||||
#
|
#
|
||||||
# Bulletins PDF:
|
# Bulletins PDF:
|
||||||
# sco_cache.PDFBulCache.get(formsemestre_id, version)
|
# sco_cache.SemBulletinsPDFCache.get(formsemestre_id, version)
|
||||||
# sco_cache.PDFBulCache.set(formsemestre_id, version, filename, pdfdoc)
|
# sco_cache.SemBulletinsPDFCache.set(formsemestre_id, version, filename, pdfdoc)
|
||||||
# sco_cache.PDFBulCache.delete(formsemestre_id) suppr. toutes les versions
|
# sco_cache.SemBulletinsPDFCache.delete(formsemestre_id) suppr. toutes les versions
|
||||||
|
|
||||||
# Evaluations:
|
# Evaluations:
|
||||||
# sco_cache.EvaluationCache.get(evaluation_id), set(evaluation_id, value), delete(evaluation_id),
|
# sco_cache.EvaluationCache.get(evaluation_id), set(evaluation_id, value), delete(evaluation_id),
|
||||||
|
@ -1894,21 +1894,9 @@ class BasePreferences(object):
|
|||||||
"""Returns preference value.
|
"""Returns preference value.
|
||||||
when no value defined for this semestre, returns global value.
|
when no value defined for this semestre, returns global value.
|
||||||
"""
|
"""
|
||||||
params = {
|
if formsemestre_id in self.prefs:
|
||||||
"dept_id": self.dept_id,
|
return self.prefs[formsemestre_id].get(name, self.prefs[None][name])
|
||||||
"name": name,
|
return self.prefs[None][name]
|
||||||
"formsemestre_id": formsemestre_id,
|
|
||||||
}
|
|
||||||
cnx = ndb.GetDBConnexion()
|
|
||||||
plist = self._editor.list(cnx, params)
|
|
||||||
if not plist:
|
|
||||||
params["formsemestre_id"] = None
|
|
||||||
plist = self._editor.list(cnx, params)
|
|
||||||
if not plist:
|
|
||||||
return self.default[name]
|
|
||||||
p = plist[0]
|
|
||||||
_convert_pref_type(p, self.prefs_dict[name])
|
|
||||||
return p["value"]
|
|
||||||
|
|
||||||
def __contains__(self, item):
|
def __contains__(self, item):
|
||||||
return item in self.prefs[None]
|
return item in self.prefs[None]
|
||||||
|
@ -46,7 +46,7 @@ from app.scodoc import sco_etud
|
|||||||
from app.scodoc import sco_excel
|
from app.scodoc import sco_excel
|
||||||
from app.scodoc import sco_preferences
|
from app.scodoc import sco_preferences
|
||||||
from app.scodoc.gen_tables import GenTable
|
from app.scodoc.gen_tables import GenTable
|
||||||
from app import log
|
from app import log, cache
|
||||||
from app.scodoc.scolog import logdb
|
from app.scodoc.scolog import logdb
|
||||||
import app.scodoc.sco_utils as scu
|
import app.scodoc.sco_utils as scu
|
||||||
|
|
||||||
@ -226,6 +226,7 @@ def _user_list(user_name):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
@cache.memoize(timeout=50) # seconds
|
||||||
def user_info(user_name_or_id=None, user=None):
|
def user_info(user_name_or_id=None, user=None):
|
||||||
"""Dict avec infos sur l'utilisateur (qui peut ne pas etre dans notre base).
|
"""Dict avec infos sur l'utilisateur (qui peut ne pas etre dans notre base).
|
||||||
Si user_name est specifie (string ou id), interroge la BD. Sinon, user doit etre une instance
|
Si user_name est specifie (string ou id), interroge la BD. Sinon, user doit etre une instance
|
||||||
|
@ -306,6 +306,7 @@ sco_publish(
|
|||||||
@bp.route("/groups_view")
|
@bp.route("/groups_view")
|
||||||
@scodoc
|
@scodoc
|
||||||
@permission_required_compat_scodoc7(Permission.ScoView)
|
@permission_required_compat_scodoc7(Permission.ScoView)
|
||||||
|
# @permission_required(Permission.ScoView)
|
||||||
@scodoc7func
|
@scodoc7func
|
||||||
def groups_view(
|
def groups_view(
|
||||||
group_ids=(),
|
group_ids=(),
|
||||||
@ -319,7 +320,7 @@ def groups_view(
|
|||||||
formsemestre_id=None,
|
formsemestre_id=None,
|
||||||
):
|
):
|
||||||
return sco_groups_view.groups_view(
|
return sco_groups_view.groups_view(
|
||||||
group_ids=(),
|
group_ids=group_ids,
|
||||||
format=format,
|
format=format,
|
||||||
# Options pour listes:
|
# Options pour listes:
|
||||||
with_codes=with_codes,
|
with_codes=with_codes,
|
||||||
|
Loading…
Reference in New Issue
Block a user