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

이민희

2021-11-04 dc79ec21ead7e9ac5949bba185f8d9b7f5c68665

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


 Conflicts:

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

 src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java

@@ -85,6 +85,14 @@
        this.basicUser = basicUser;
    }

    public List<Long> getRemoveIds() {
        return removeIds;
    }

    public void setRemoveIds(List<Long> removeIds) {
        this.removeIds = removeIds;
    }

    public Boolean getPermWorkSpaceSetting() {
        return permWorkSpaceSetting;
    }
@@ -141,14 +149,6 @@
        this.permQnA = permQnA;
    }

    public Boolean getPermEvent() {
        return permEvent;
    }

    public void setPermEvent(Boolean permEvent) {
        this.permEvent = permEvent;
    }

    public Boolean getPermGuide() {
        return permGuide;
    }
@@ -157,12 +157,12 @@
        this.permGuide = permGuide;
    }

    public List<Long> getRemoveIds() {
        return removeIds;
    public Boolean getPermEvent() {
        return permEvent;
    }

    public void setRemoveIds(List<Long> removeIds) {
        this.removeIds = removeIds;
    public void setPermEvent(Boolean permEvent) {
        this.permEvent = permEvent;
    }

    public void makePermission() {
@@ -170,8 +170,8 @@

        this.permission |= MngPermission.makePermission(getPermWorkSpaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
        this.permission |= MngPermission.makePermission(getPermProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT);
        this.permission |= MngPermission.makePermission(getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
        this.permission |= MngPermission.makePermission(getPermApi(), MngPermission.USER_PERMISSION_MNG_API);
        this.permission |= MngPermission.makePermission(getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
        this.permission |= MngPermission.makePermission(getPermNotice(), MngPermission.USER_PERMISSION_MNG_NOTICE);
        this.permission |= MngPermission.makePermission(getPermFAQ(), MngPermission.USER_PERMISSION_MNG_FAQ);
        this.permission |= MngPermission.makePermission(getPermQnA(), MngPermission.USER_PERMISSION_MNG_QNA);

 src/main/resources/migration/V1_10__Alter_Table.sql

@@ -26,3 +26,5 @@
    PRIMARY KEY (`id`) USING btree
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

ALTER TABLE `user_workspace` ADD COLUMN `level_name` VARCHAR(50) NOT NULL;
ALTER TABLE `user_workspace` ADD COLUMN `department_name` VARCHAR(50) NOT NULL;

 src/main/resources/mybatis/query-template/userWorkspace-template.xml

@@ -9,6 +9,8 @@
        u.id as userId,
        u.name as userName,
        u.account as account,
        u.levelName as levelName,
        u.departmentName as departmentName,
        /*u.permission as permission,*/
        CASE WHEN uw.use_yn = 'Y' THEN 'true' ELSE 'false' END as useYn
        FROM

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

@@ -74,7 +74,7 @@
                        //description : $rootScope.preventXss($scope.vm.form.description)
                    };

                    UserWorkspace.levelModify($resourceProvider.getContent(condition,
                    UserWorkspace.modifyLevel($resourceProvider.getContent(condition,
                        content,
                        $resourceProvider.getPageContent(0, 0))).then(function (result) {


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

@@ -21,7 +21,7 @@
                $scope.vm = {
                    form : {
                        levelName : "",
                        permWorkspaceSetting : false,
                        permWorkSpaceSetting : false,
                        permProjectSetting : false,
                        permIssueSetting : false,
                        permApi : false,

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

@@ -38,7 +38,7 @@
                        <span translate="manageUser.manageWorkspacePerm">워크스페이스 관리</span>
                    </td>
                    <td colspan="2">
                        <label class='switch'><input type='checkbox' ng-model='vm.form.permWorkspaceSetting'><span class='slider round'></span></label>
                        <label class='switch'><input type='checkbox' ng-model='vm.form.permWorkSpaceSetting'><span class='slider round'></span></label>
                    </td>
                </tr>
                <tr>