Merge branch 'master' of http://git.khansia.co.id/Nahrowi/oku-gis

Application/views.py

 from django.http import response
 from API.views import jalan
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import User, Group, Permission
 from django.shortcuts import render, redirect
 # from django.views.generic import ListView, DetailView,  DeleteView, UpdateView, CreateView
 from django.views import View, generic

myauth/views.py

@@ -491,6 +491,8 @@ def loadGroupById(iduser):
     # print(resGroup)
     return resGroup
 
+import json
+from django.contrib.auth.models import Permission
 @api_view(('POST',))
 def addGroup(request):
     
@@ -498,8 +500,9 @@ def addGroup(request):
         name    = request.POST.get('name')
         idgroup = request.POST.get('id')
         parent  = request.POST.get('parent')
-        print(parent)
-        
+        all_perm = request.POST.get('all_perm')
+        all_perm = json.loads(all_perm)
+                
         if parent != '':
             for s in Group.objects.all():
                 if s.name == parent:
@@ -560,6 +563,12 @@ def addGroup(request):
                 with conn.cursor() as cursor:
                     cursor.execute("INSERT INTO auth_group(name, have_parent) VALUES ('"+name+"', "+str(userGroup)+")")
                     result = cursor.rowcount
+            
+            group = Group.objects.get(name=name)
+            
+            for i in all_perm:
+                permiss = Permission.objects.get(codename=i)
+                group.permissions.add(permiss)
                     
             if result > 0:
                 data = {

static/js/action.js

@@ -241,7 +241,7 @@ function load_manage() {
                 number += 1;
                 var id = data['group'][i]['id'];
                 var name = data['group'][i]['name'];
-                
+
                 var data_gab = `<tr>
                         <td>` + number + `</td>
                         <td>` + name + `</td>
@@ -279,7 +279,7 @@ function load_manage() {
                 var switchery = new Switchery(primary_s[z], { color: '#5A9AFB', secondaryColor: '#3B3E47', jackColor: '#fff', jackSecondaryColor: '#fff' });
             }
             //endgroup
-            
+
             var data_point = []
             var number2 = 0;
 
@@ -826,7 +826,7 @@ function loadgroupbyid(id) {
             $("#modal_edit_group").css('display', 'block');
             $("#modal_edit_group").modal("show")
             $(".modstit").html("Update Group")
-            // $("#ingroup").attr("disabled", true)
+                // $("#ingroup").attr("disabled", true)
 
             let response = data;
 
@@ -836,12 +836,12 @@ function loadgroupbyid(id) {
                 $("#ingroup").val(grup.name);
                 var gays = []
                 gays.push(grup.parent)
-                if (grup.parent == null){
+                if (grup.parent == null) {
                     loadparent()
                 } else {
                     loadparent(gays)
                 }
-                
+
                 // if (user.is_staff) {
                 //     $('input[name=isStaff][value=true]').attr('checked', true)
                 // } else {
@@ -958,6 +958,7 @@ function gas_k_adm_perm() {
         document.getElementById("delete_k_adm_perm").checked = false;
     }
 }
+
 function gas_rs_perm() {
     var checkBox = document.getElementById("rs_perm");
     if (checkBox.checked == true) {
@@ -971,6 +972,7 @@ function gas_rs_perm() {
         document.getElementById("delete_rs_perm").checked = false;
     }
 }
+
 function gas_puskes_perm() {
     var checkBox = document.getElementById("puskes_perm");
     if (checkBox.checked == true) {
@@ -984,6 +986,7 @@ function gas_puskes_perm() {
         document.getElementById("delete_puskes_perm").checked = false;
     }
 }
+
 function gas_lakes_perm() {
     var checkBox = document.getElementById("lakes_perm");
     if (checkBox.checked == true) {
@@ -997,6 +1000,7 @@ function gas_lakes_perm() {
         document.getElementById("delete_lakes_perm").checked = false;
     }
 }
+
 function gas_si_perm() {
     var checkBox = document.getElementById("si_perm");
     if (checkBox.checked == true) {
@@ -1010,6 +1014,7 @@ function gas_si_perm() {
         document.getElementById("delete_si_perm").checked = false;
     }
 }
+
 function gas_skul_perm() {
     var checkBox = document.getElementById("skul_perm");
     if (checkBox.checked == true) {
@@ -1023,6 +1028,7 @@ function gas_skul_perm() {
         document.getElementById("delete_skul_perm").checked = false;
     }
 }
+
 function gas_st_perm() {
     var checkBox = document.getElementById("st_perm");
     if (checkBox.checked == true) {
@@ -1036,6 +1042,7 @@ function gas_st_perm() {
         document.getElementById("delete_st_perm").checked = false;
     }
 }
+
 function gas_term_perm() {
     var checkBox = document.getElementById("term_perm");
     if (checkBox.checked == true) {
@@ -1049,6 +1056,7 @@ function gas_term_perm() {
         document.getElementById("delete_term_perm").checked = false;
     }
 }
+
 function gas_cb_perm() {
     var checkBox = document.getElementById("cb_perm");
     if (checkBox.checked == true) {
@@ -1062,6 +1070,7 @@ function gas_cb_perm() {
         document.getElementById("delete_cb_perm").checked = false;
     }
 }
+
 function gas_gl_perm() {
     var checkBox = document.getElementById("gl_perm");
     if (checkBox.checked == true) {
@@ -1132,6 +1141,7 @@ function gas_teritori_perm() {
         document.getElementById("edit_kecamatan_perm").checked = false;
     }
 }
+
 function gas_kelurahan_perm() {
     var checkBox = document.getElementById("kelurahan_perm");
     if (checkBox.checked == true) {
@@ -1140,6 +1150,7 @@ function gas_kelurahan_perm() {
         document.getElementById("edit_kelurahan_perm").checked = false;
     }
 }
+
 function gas_kecamatan_perm() {
     var checkBox = document.getElementById("kecamatan_perm");
     if (checkBox.checked == true) {
@@ -1207,7 +1218,7 @@ function gas_all_perm() {
         document.getElementById("edit_jalan_perm").checked = true;
         document.getElementById("delete_jalan_perm").checked = true;
         document.getElementById("perbaikan_jalan_perm").checked = true;
-        
+
         document.getElementById("teritori_perm").checked = true;
         document.getElementById("kelurahan_perm").checked = true;
         document.getElementById("kecamatan_perm").checked = true;
@@ -1216,7 +1227,7 @@ function gas_all_perm() {
 
         document.getElementById("lahan_perm").checked = true;
         document.getElementById("edit_lahan_perm").checked = true;
-        
+
 
     } else if (checkBox.checked == false) {
         document.getElementById("point_perm").checked = false;
@@ -1273,7 +1284,7 @@ function gas_all_perm() {
         document.getElementById("edit_jalan_perm").checked = false;
         document.getElementById("delete_jalan_perm").checked = false;
         document.getElementById("perbaikan_jalan_perm").checked = false;
-        
+
         document.getElementById("teritori_perm").checked = false;
         document.getElementById("kelurahan_perm").checked = false;
         document.getElementById("kecamatan_perm").checked = false;
@@ -1422,6 +1433,10 @@ $("#saveuser").on("click", function() {
 })
 
 $("#savegroup").on("click", function() {
+    var all_perm = []
+    $.each($("input[name='chekbox']:checked"), function() {
+        all_perm.push($(this).val())
+    });
     var isObject = {};
     var ars = ''
     var idgroup = $("#idgroup").val();
@@ -1433,6 +1448,7 @@ $("#savegroup").on("click", function() {
 
     isObject['name'] = $("#ingroup").val();
     isObject['parent'] = $("#select_parent").val();
+    isObject['all_perm'] = JSON.stringify(all_perm)
     isObject.group = group
 
     console.log(group)