diff --git a/abonapp/views.py b/abonapp/views.py index fdccc10..d1de8e6 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -500,7 +500,10 @@ class TaskLogListView(AbonappPermissionMixin, ListView): template_name = 'abonapp/task_log.html' def get_permission_object(self): - return self.abon.group + if hasattr(self, 'abon'): + return self.abon.group + else: + return get_object_or_404(models.Group, pk=self.kwargs.get('gid')) def get_queryset(self): abon = get_object_or_404(models.Abon, username=self.kwargs.get('uname')) diff --git a/install/install_debian.sh b/install/install_debian.sh new file mode 100644 index 0000000..c2b5c5e --- /dev/null +++ b/install/install_debian.sh @@ -0,0 +1,14 @@ +/usr/bin/bash - + +PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin + +apt update +apt upgrade +apt-get install postgresql python3-dev python3-pip python3-pil uwsgi nginx uwsgi-plugin-python3 libsnmp-dev git gettext libcurl4-openssl-dev libssl-dev + +chown -R www-data:www-data /var/www + +cd /var/www + +git clone https://github.com/nerosketch/djing.git -b devel djing + diff --git a/install_debian.sh b/install_debian.sh deleted file mode 100644 index 4846d1b..0000000 --- a/install_debian.sh +++ /dev/null @@ -1,3 +0,0 @@ -/usr/bin/bash - - -apt-get install mariadb-server mariadb-client default-libmysqlclient-dev python3-dev python3-pip python3-pil uwsgi nginx uwsgi-plugin-python3 libsnmp-dev git gettext libcurl4-openssl-dev libssl-dev diff --git a/requirements.txt b/requirements.txt index 9553b0e..8c24d4a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,8 +10,8 @@ netaddr xmltodict dicttoxml -# Django recommended mysql client -mysqlclient +# db client for Postgres +psycopg2-binary easysnmp pid