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

wyu

2021-12-28 a75bcc7c2b0fc98bd3a8abc100a4ad4ec11b9c26

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

@@ -727,7 +727,8 @@
                                            break;

                                        case "NOTICE_REGISTER":
                                            makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">OWL ITS TEAM</span>';
                                            //makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">OWL ITS TEAM</span>';
                                            makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer+ '</span>';
                                            break;
                                        case "GUIDE_MODIFY":
                                            if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_GUIDE')) {
@@ -783,11 +784,13 @@
                                            makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer + '</span>';
                                            break;
                                        case "FAQ_ACTIVE" :
                                            makeTag += "<label class='switch'><input type='checkbox' ng-model='data.activation' ng-click='event.activation(data)'><span class='slider round'></span></label>";
                                            if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_FAQ')) {
                                                makeTag += "<label class='switch'><input type='checkbox' ng-model='data.activation' ng-click='event.activation(data)'><span class='slider round'></span></label>";
                                            }
                                            break;

                                        case "QNA_MODIFY":
                                            if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_QNA')) {
                                            if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_QNA') || $rootScope.user.id === scope.data.registerId) {
                                                makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.title.replace(/</gi, '&lt;') + "</span>";
                                            }
                                            else {