DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Buttons richtig und Zeichensatzcheck im Dashboard

This commit is contained in:
holger.trampe 2020-04-19 19:14:52 +02:00
parent c4b04715fd
commit 1b7f010a01
5 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
digitaleagentur/__pycache__/settings.cpython-38.pyc
View File

Binary file not shown.

4
digitaleagentur/settings.py
View File

@ -15,9 +15,9 @@ import os
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
############################################## DEV #####################################
BASE_URL = "https://dev01.digitale-agentur.com/"
CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D"
# MAIL DEV
EMAIL_HOST = 'smtp.strato.de'
@ -57,8 +57,6 @@ DEBUG = True
ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', 'localhost', 'dev01.digitale-agentur.com']
# Application definition
INSTALLED_APPS = [
'notificsys.apps.NotificsysConfig',

23
standards/templates/standards/standards_update.html
View File

@ -40,8 +40,6 @@
</div>
</div>
<div class="card">
<div class="card-header" id="st_useraut">
<h5 class="mb-0">
@ -197,26 +195,29 @@
</div>
</div>
</div>
</div>
</div>
<div style="float: left;">
<p>Wenn ein Standard bearbeitet wurde, kann er nur von einer Person mit dem Recht <i>Standards bearbeiten und freischalten</i> wieder veröffentlicht werden. Ein Standard wird nach Bearbeitung als <i>Nicht veröffentlicht</i> gesetzt.</p>
<hr>
<button type="submit" class="btn btn-success" href="{% url 'standard-update' standard_id %} ">Speichern</button>&nbsp;
<hr>
<button type="submit" class="btn btn-success" href="{% url 'standard-update' standard_id %} ">Speichern</button>&nbsp;
{% if perms.users.standard_management %}
{% if standard_status == False %}
<a class="btn btn-primary" href="{% url 'standard-status' standard_id %} ">Standard veröffentlichen</a>&nbsp;
<a class="btn btn-primary" href="{% url 'standard-status' standard_id %} ">Standard veröffentlichen</a>&nbsp;
{% else %}
<a class="btn btn-warning" href="{% url 'standard-status' standard_id %} ">Veröffentlichung aufheben</a>&nbsp;
<a class="btn btn-warning" href="{% url 'standard-status' standard_id %} ">Veröffentlichung aufheben</a>&nbsp;
{% endif %}
{% endif %}
<a class="btn" href="{% url 'standards' %} ">Abbrechen</a>
<a class="btn" href="{% url 'standards' %} ">Abbrechen</a>
</form>
</div>
</div>
<!-- FILE FORBIDDEN DELETE FILE -->
<div class="modal fade" id="forbiddenFileType" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="groupDelFunction" aria-hidden="true">

3
users/templates/users/dashboard.html
View File

@ -86,6 +86,9 @@
</div>
<script type="text/javascript">
console.log("{{systemencode}}");
</script>
{% endblock content %}

7
users/views.py
View File

@ -35,7 +35,7 @@ from message.models import Message
from notificsys.models import UserNotification
from organizer.models import AGContacts, AGPassword
import socket
import sys
def randomString(stringLength=10):
"""Generate a random string of fixed length """
@ -171,8 +171,11 @@ def dashboard(request):
toUpdate(request)
storageinfo = sys.getfilesystemencoding()
context = {
'active_link' : 'dashboard'
'active_link' : 'dashboard',
"systemencode" : storageinfo
}
# Adding active_link
# Loading only user same agency