-
Standards
+
Standards
Sichtbar sind alle veröffentlichten und von {{ user.first_name }} {{ user.last_name}} erstellten Standards.
-
- Standards dokumentieren und erläutern verschiedenen Verfahren, strukturiert nach Bereichen und Aufgaben.
-
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index 321d86b..071e4fc 100644
Binary files a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc and b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc differ
diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index f4884d3..58a0593 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -1,6 +1,7 @@
from django import template
from django.contrib.auth.models import Group, User
from users.models import AgencyGroup
+import os
register = template.Library()
b = 0
@@ -50,6 +51,16 @@ def usergperm(user, perm):
def is_member(id, groupname):
usertocheck = User.objects.get(pk=id)
return usertocheck.groups.filter(name=groupname).exists()
+
+# Return a Filename splitted to only see the LAST element!
+@register.filter(name="splitdirstyle")
+def split_dir_style(dirtosplit):
+ tempsplit = dirtosplit.split("\\")
+ return tempsplit[len(tempsplit)-1]
+
+@register.filter(name="filename")
+def filename(value):
+ return os.path.basename(value.file.name)
'''
class Counter:
count = 0
diff --git a/users/__pycache__/models.cpython-38.pyc b/users/__pycache__/models.cpython-38.pyc
index 623516e..821489b 100644
Binary files a/users/__pycache__/models.cpython-38.pyc and b/users/__pycache__/models.cpython-38.pyc differ
diff --git a/users/__pycache__/signals.cpython-38.pyc b/users/__pycache__/signals.cpython-38.pyc
index 025e517..3f7f6d7 100644
Binary files a/users/__pycache__/signals.cpython-38.pyc and b/users/__pycache__/signals.cpython-38.pyc differ
diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc
index 253c642..1016e41 100644
Binary files a/users/__pycache__/views.cpython-38.pyc and b/users/__pycache__/views.cpython-38.pyc differ
diff --git a/users/models.py b/users/models.py
index 33a1be3..5d3190d 100644
--- a/users/models.py
+++ b/users/models.py
@@ -194,12 +194,14 @@ class AgencyGroup(models.Model):
permissions = [
('agencyinfo', 'Agenturinformationen verändern'),
- ('usermanager', 'Benutzer bearbeiten'),
+ ('usermanager', 'Mitarbeiter bearbeiten'),
('groupmanager', 'Gruppen bearbeiten'),
- ('areaconfig', 'Bereiche bearbeiten'),
- ('activityconfig', 'Tätigkeiten bearbeiten'),
+ ('structuremanager', 'Struktur bearbeiten'),
('standardmanager', 'Standards bearbeiten und freischalten'),
('modulenews', 'News bearbeiten und veröffentlichen'),
('modulesconfig', 'Module verwalten'),
- ('modulequicklinks', 'Quicklinks bearbeiten')
+ ('modulequicklinks', 'Quicklinks bearbeiten'),
+ ('filesmanager', 'Dateien bearbeiten'),
+ ('filedirmanager', 'Ordner bearbeiten'),
+ ('filesviewer', 'Dateien lesen')
]
\ No newline at end of file
diff --git a/users/signals.py b/users/signals.py
index 5665687..79d8773 100644
--- a/users/signals.py
+++ b/users/signals.py
@@ -101,6 +101,7 @@ def adjust_group_notifications(instance, action, reverse, model, pk_set, using,
@receiver(post_save, sender=News)
def save_news(sender, instance, **kwargs):
+ GLOBALSENDMAILS = True
if(kwargs["created"]):
usersofagency = User.objects.filter(profile__agency__pk=instance.agency.pk)
for user in usersofagency:
@@ -126,7 +127,7 @@ def save_news(sender, instance, **kwargs):
# SIGNALS FOR TASK
@receiver(signal=m2m_changed, sender=Tasks.usersfield.through)
-def adjust_group_notifications(instance, action, reverse, model, pk_set, using, *args, **kwargs):
+def adjust_group_notifications_task(instance, action, reverse, model, pk_set, using, *args, **kwargs):
# IF FALSE NO MAILS WILL BE SEND - IN PRODUCTIVITY CHANGE TO TRUE #
GLOBALSENDMAILS = True
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 522294c..9d2195c 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -1,4 +1,5 @@
{% load static %}
+{% load counter_tag %}
@@ -126,14 +127,14 @@
{% endif %}
- {% if request.user.profile.agency.module_files %}
+ {% if request.user.profile.agency.module_files and request.user|usergperm:"filesviewer" %}
{% if active_link == 'cloud' %}
{% else%}
{%endif%}
-
+
Dateien