Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-11-12 c8d436c6d85ea6f1e93c838a8b5a4690d0f075e4

Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa


 Conflicts:

	src/main/webapp/scripts/app/workspace/workspaceUserDepartmentModify.controller.js

	src/main/webapp/scripts/main.js

	src/main/webapp/views/workspace/workspaceUserDepartmentModify.html

 src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js

@@ -136,9 +136,9 @@
                                            makeTag += "<ul class='ul-not-comma'>";

                                            if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //속해있는 부서가 없을 경우
                                                makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id, data.userId)'>부서를 선택해 주세요.</div>";
                                                makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>부서를 선택해 주세요.</div>";
                                            }else{
                                                makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
                                                makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
                                                angular.forEach(scope.data.departmentVos, function (departments) {
                                                    makeTag += "<li>" + departments.departmentName + "</li>";
                                                });

 src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js

@@ -192,7 +192,7 @@
                    //  삭제 알림
                    SweetAlert.swal({
                            title : $filter("translate")("managementWorkspace.deleteDepartment"), // "부서 삭제"
                            text : $filter("translate")("customField.wantToDeleteSelectDepartment"), // "선택한 부서를 삭제하겠습니까? 삭제된 부서는 복구할 수 없습니다."
                            text : $filter("translate")("managementWorkspace.wantToDeleteSelectDepartment"), // "선택한 부서를 삭제하겠습니까? 삭제된 부서는 복구할 수 없습니다."
                            type : "warning",
                            showCancelButton : true,
                            confirmButtonColor : "#DD6B55",