mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-08-17 02:59:59 +02:00
Compare commits
1 Commits
ce16d25752
...
fix_activi
Author | SHA1 | Date | |
---|---|---|---|
|
0d0fdef363 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -48,6 +48,7 @@ backups/
|
|||||||
env/
|
env/
|
||||||
venv/
|
venv/
|
||||||
db.sqlite3
|
db.sqlite3
|
||||||
|
shell.nix
|
||||||
|
|
||||||
# ansibles customs host
|
# ansibles customs host
|
||||||
ansible/host_vars/*.yaml
|
ansible/host_vars/*.yaml
|
||||||
|
@@ -329,7 +329,7 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
|
|||||||
context["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk
|
context["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk
|
||||||
context["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk
|
context["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk
|
||||||
|
|
||||||
activities_open = Activity.objects.filter(open=True).filter(
|
activities_open = Activity.objects.filter(open=True, activity_type__manage_entries=True).filter(
|
||||||
PermissionBackend.filter_queryset(self.request, Activity, "view")).distinct().all()
|
PermissionBackend.filter_queryset(self.request, Activity, "view")).distinct().all()
|
||||||
context["activities_open"] = [a for a in activities_open
|
context["activities_open"] = [a for a in activities_open
|
||||||
if PermissionBackend.check_perm(self.request,
|
if PermissionBackend.check_perm(self.request,
|
||||||
|
@@ -1,34 +0,0 @@
|
|||||||
# This is a workaround meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
|
|
||||||
#
|
|
||||||
# The nk20 javascript static location are hardcoded for imperative system.
|
|
||||||
# This make ./manage.py collectstatic hard to use with nixos.
|
|
||||||
#
|
|
||||||
# A workaround is to enter a FHSUserEnv with the static placed under /share/javascript/<static>.
|
|
||||||
# This emulate a debian like system and enable collecting static normally with ./manage.py collectstatics.
|
|
||||||
# The regular shell.nix should be enough for other configurations.
|
|
||||||
#
|
|
||||||
# Warning, you are still supposed to use pip package with a venv !
|
|
||||||
{ pkgs ? import <nixpkgs> {} }:
|
|
||||||
(pkgs.buildFHSUserEnv {
|
|
||||||
name = "pipzone";
|
|
||||||
targetPkgs = pkgs: (with pkgs;
|
|
||||||
let
|
|
||||||
fhs-static = stdenv.mkDerivation {
|
|
||||||
name = "fhs-static";
|
|
||||||
buildCommand = ''
|
|
||||||
mkdir -p $out/share/javascript/bootstrap4
|
|
||||||
mkdir -p $out/share/javascript/jquery
|
|
||||||
ln -s ${python39Packages.xstatic-bootstrap}/lib/python3.9/site-packages/xstatic/pkg/bootstrap/data/* $out/share/javascript/bootstrap4
|
|
||||||
ln -s ${python39Packages.xstatic-jquery}/lib/python3.9/site-packages/xstatic/pkg/jquery/data/* $out/share/javascript/jquery
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in [
|
|
||||||
fhs-static
|
|
||||||
python39
|
|
||||||
gettext
|
|
||||||
python39Packages.pip
|
|
||||||
python39Packages.virtualenv
|
|
||||||
python39Packages.setuptools
|
|
||||||
]);
|
|
||||||
runScript = "bash";
|
|
||||||
}).env
|
|
23
shell.nix
23
shell.nix
@@ -1,23 +0,0 @@
|
|||||||
# This is meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
|
|
||||||
#
|
|
||||||
# This shell.nix contains all dependencies require to create a venv and pip install -r requirements.txt.
|
|
||||||
#
|
|
||||||
# Please check shell-static.nix for running ./manage.py collectstatics.
|
|
||||||
{ pkgs ? import <nixpkgs> {} }:
|
|
||||||
pkgs.mkShell {
|
|
||||||
buildInputs = with pkgs; [
|
|
||||||
python39
|
|
||||||
python39Packages.pip
|
|
||||||
python39Packages.setuptools
|
|
||||||
gettext
|
|
||||||
|
|
||||||
];
|
|
||||||
shellHook = ''
|
|
||||||
# Tells pip to put packages into $PIP_PREFIX instead of the usual locations.
|
|
||||||
# See https://pip.pypa.io/en/stable/user_guide/#environment-variables.
|
|
||||||
export PIP_PREFIX=$(pwd)/_build/pip_packages
|
|
||||||
export PYTHONPATH="$PIP_PREFIX/${pkgs.python39.sitePackages}:$PYTHONPATH"
|
|
||||||
export PATH="$PIP_PREFIX/bin:$PATH"
|
|
||||||
unset SOURCE_DATE_EPOCH
|
|
||||||
'';
|
|
||||||
}
|
|
Reference in New Issue
Block a user