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

Gruppenbug gelöst

This commit is contained in:
Holger Trampe 2021-10-10 21:39:31 +02:00
parent 6707c4d5db
commit b80fb0fd15
4 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
adm/views.py
View File

@ -664,21 +664,6 @@ class AdmAddBreak(CreateView):
return reverse('adm-workday-update', kwargs={'pk': self.kwargs['pk']}) return reverse('adm-workday-update', kwargs={'pk': self.kwargs['pk']})
''' '''
IMPORT AGENCY IMPORT AGENCY
''' '''

11
dasettings/templates/dasettings/groups_content.html
View File

@ -89,10 +89,11 @@
{% for user in usersofagency %} {% for user in usersofagency %}
{% for group in user.groups.all %} {% for group in user.groups.all %}
{% if group.name == aggroup.group.name %} {% if group.name == aggroup.group.name %}
{% if request.user == user and aggroup.is_admin %} {% if request.user == user and aggroup.is_admin or aggroup.agencygroupname == "Mitarbeiter" %}
<span class="badge badge-pill badge-primary mr-2 mt-2"><button class="btn btn-primary" disabled="true">{{ user.first_name }} {{ user.last_name }}</button></span> <span class="badge badge-pill badge-primary mr-2 mt-2"><button class="btn btn-primary" disabled="true">{{ user.first_name }} {{ user.last_name }}</button></span>
{% else %} {% else %}
<span id="span_btn_{{user.pk}}_{{aggroup.pk}}" class="badge badge-pill badge-primary mr-2 mt-2"><a class="btn btn-primary" onclick="javascript:removeUserFromGroup({{ user.pk }}, {{aggroup.pk}})">{{ user.first_name }} {{ user.last_name }}&nbsp;&nbsp;<i class="fas fa-times"></i></a > <span id="span_btn_{{user.pk}}_{{aggroup.pk}}" class="badge badge-pill badge-primary mr-2 mt-2">
<a class="btn btn-primary" onclick="javascript:removeUserFromGroup({{ user.pk }}, {{aggroup.pk}})">{{ user.first_name }} {{ user.last_name }}&nbsp;&nbsp;<i class="fas fa-times"></i></a >
</span> </span>
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -352,9 +353,9 @@ function changeGroupName(groupid){
{ {
$("#newgroupname").val(data['data']['groupname']); $("#newgroupname").val(data['data']['groupname']);
$("#modTitle").html("Gruppenname ändern"); $("#modTitle").html("Gruppenname ändern");
$("#saveNewGroup").prop("disabled", false); $("#saveNewGroup").prop("disabled", false);
groupupdate_id = groupid; groupupdate_id = groupid;
groupaction = 1; groupaction = 1;
} }
}); });
} }

26
dasettings/views.py
View File

@ -670,18 +670,29 @@ def SettingsAjaxRouter(request):
data = {"newvalue" : group.agencygroupname} data = {"newvalue" : group.agencygroupname}
# Update Groupname in NC # Update Groupname in NC
'''
headers = { headers = {
'Accept' : 'application/json', 'Accept' : 'application/json',
'Access-Control-Allow-Headers' : 'OCS-APIRequest', 'Access-Control-Allow-Headers' : 'OCS-APIRequest',
'OCS-APIRequest' : 'true' 'OCS-APIRequest' : 'true',
} }
'''
'''
data_nc = { data_nc = {
"groupid" : group.nc_name, "groupid" : group.nc_name,
"newvalue" : request.GET['newvalue'] "newvalue" : request.GET['newvalue']
} }
r = requests.post(settings.NEXTCLOUD_URL + "/apps/agency/updateagencygroup", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) '''
#r = requests.post(settings.NEXTCLOUD_URL + "/apps/agency/updateagencygroup", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API))
data = {
"name": request.GET['newvalue'],
"id" : group.nc_name
}
r = requests.post(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/da_agency/api/v1/renameagg?format=json", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data)
#r = requests.post(settings.NEXTCLOUD_URL + "/apps/agency/api/v1/renameagg", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API))
success = True success = True
data = {"newvalue" : request.GET['newvalue']}
else: else:
success = False success = False
# GRUPPENNAMEN HOLEN # GRUPPENNAMEN HOLEN
@ -726,7 +737,11 @@ def SettingsAjaxRouter(request):
#data_nc = { #data_nc = {
# "groupid" : nc_groupid # "groupid" : nc_groupid
#} #}
data = {
"name": tempgroup_ag.agencygroupname,
"id" : nc_groupid
}
r = requests.post(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/da_agency/api/v1/renameagg?format=json", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data)
#r = requests.post(settings.NEXTCLOUD_URL + "ocs/v1.php/cloud/users/" + request.user.username + "/groups", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) #r = requests.post(settings.NEXTCLOUD_URL + "ocs/v1.php/cloud/users/" + request.user.username + "/groups", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API))
else: else:
@ -951,7 +966,6 @@ def SettingsAjaxRouter(request):
"key" : "email", "key" : "email",
"value" : newmail "value" : newmail
} }
print(data_nc)
r = requests.put(settings.NEXTCLOUD_URL + "/ocs/v1.php/cloud/users/" + tempuser.username,headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data_nc) r = requests.put(settings.NEXTCLOUD_URL + "/ocs/v1.php/cloud/users/" + tempuser.username,headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data_nc)
print(r.text) print(r.text)
success = True success = True

1
users/views.py
View File

@ -101,6 +101,7 @@ def create_group_id(agencygroupname, agency):
return newgroupid return newgroupid
# TODO: Hier checken, ob die Registrierung klappt!
def createNewAgencyByNC(request, uid): def createNewAgencyByNC(request, uid):
print("CREATE NEW AGENCY") print("CREATE NEW AGENCY")
# Creating Agency and prepare basic-Structure # Creating Agency and prepare basic-Structure