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

이민희

2021-12-15 e13780214d7911af890e8014617789d0b273509a

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

 src/main/webapp/i18n/ko/global.json

@@ -701,9 +701,11 @@
        "add": "추가",
        "addFunction": "추가기능",
        "downloadExcel": "엑셀 다운로드",
        "allDownloadExcel": "엑셀 전체 다운로드",
        "importExcel": "Excel Import",
        "registerExcelUploadIssue": "엑셀 업로드 이슈 등록",
        "delete": "삭제",
        "selectDelete": "선택 항목 모두 삭제",
        "checkPurgingTargets": "삭제 대상 확인",
        "selectDestinationDeletion": "삭제 대상을 선택하세요.",
        "deleteFailed": "삭제 실패",

 src/main/webapp/views/companyField/companyFieldList.html

@@ -76,8 +76,8 @@
                                    </button>
                                    <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
                                         x-placement="bottom-start">
                                        <a class="dropdown-item cursor" form-submit="companyFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">삭제</span></a>
                                        <a class="dropdown-item cursor" form-submit="companyFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">삭제</span></a>
                                    </div>
                                </div>
                            </form>

 src/main/webapp/views/customField/customFieldList.html

@@ -87,8 +87,8 @@
                                    </button>
                                    <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
                                         x-placement="bottom-start">
                                        <a class="dropdown-item cursor" form-submit="customFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">삭제</span></a>
                                        <a class="dropdown-item cursor" form-submit="customFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">삭제</span></a>
                                    </div>
                                </div>
                            </form>

 src/main/webapp/views/hostingField/hostingFieldList.html

@@ -76,8 +76,8 @@
                                    </button>
                                    <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
                                         x-placement="bottom-start">
                                        <a class="dropdown-item cursor" form-submit="hostingFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">삭제</span></a>
                                        <a class="dropdown-item cursor" form-submit="hostingFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">삭제</span></a>
                                    </div>
                                </div>
                            </form>

 src/main/webapp/views/ispField/ispFieldList.html

@@ -76,8 +76,8 @@
                                    </button>
                                    <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
                                         x-placement="bottom-start">
                                        <a class="dropdown-item cursor" form-submit="ispFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">삭제</span></a>
                                        <a class="dropdown-item cursor" form-submit="ispFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">삭제</span></a>
                                    </div>
                                </div>
                            </form>

 src/main/webapp/views/issue/issueListNormal.html

@@ -439,12 +439,12 @@
                                        </button>
                                        <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
                                             x-placement="bottom-start" >
                                            <a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.downloadExcel">엑셀 다운로드</span></a>
                                            <a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.allDownloadExcel">엑셀 다운로드</span></a>

                                            <a class="dropdown-item cursor" ng-click="fn.importExcel()"> <span translate="common.importExcel">Excel Import</span></a>
                                            <a class="dropdown-item cursor" ng-click="fn.modifyMultiIssueStatus()"> <span translate="common.updateIssueStatus">이슈 상태 변경</span></a>
                                            <a class="dropdown-item cursor" ng-click="fn.addIssueTableConfig()"> <span translate="issue.settingTableDisplay">테이블 표시 설정</span></a>
                                            <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">삭제</span></a>
                                            <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">삭제</span></a>
                                        </div>
                                    </div>
                                </form>

 src/main/webapp/views/issueStatus/issueStatusList.html

@@ -94,9 +94,9 @@
                                         x-placement="bottom-start">
                                        <a class="dropdown-item cursor" form-submit="issueStatusListForm"
                                           make-search-conditions="fn.makeSearchConditions()">
                                            <span translate="common.downloadExcel">엑셀 다운로드</span></a>
                                            <span translate="common.allDownloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span
                                                translate="common.delete">삭제</span></a>
                                                translate="common.selectDelete">삭제</span></a>
                                    </div>
                                </div>
                            </form>

 src/main/webapp/views/issueType/issueTypeList.html

@@ -76,8 +76,8 @@
                                    </button>
                                    <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
                                         x-placement="bottom-start">
                                        <a class="dropdown-item cursor" form-submit="issueTypeListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">삭제</span></a>
                                        <a class="dropdown-item cursor" form-submit="issueTypeListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">삭제</span></a>
                                    </div>
                                </div>
                            </form>

 src/main/webapp/views/notice/noticeList.html

@@ -90,8 +90,8 @@
                                    <button aria-expanded="false" aria-haspopup="true" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" type="button"><span translate="common.addFunction" class="ng-scope">추가기능</span>
                                    </button>
                                    <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu" x-placement="bottom-start">
                                        <a class="dropdown-item cursor ng-isolate-scope" form-submit="projectListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete" class="ng-scope">삭제</span></a>
                                        <a class="dropdown-item cursor ng-isolate-scope" form-submit="projectListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel" class="ng-scope">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete" class="ng-scope">삭제</span></a>

                                    </div>
                                </div>

 src/main/webapp/views/project/projectListNormal.html

@@ -91,9 +91,9 @@
                                         x-placement="bottom-start">
                                        <a class="dropdown-item cursor" form-submit="projectListForm"
                                           make-search-conditions="fn.makeSearchConditions()"><span
                                                translate="common.downloadExcel">엑셀 다운로드</span></a>
                                                translate="common.allDownloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span
                                                translate="common.delete">삭제</span></a>
                                                translate="common.selectDelete">삭제</span></a>

                                    </div>
                                </div>

 src/main/webapp/views/workflow/workflowList.html

@@ -78,8 +78,8 @@
                                    </button>
                                    <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
                                         x-placement="bottom-start">
                                        <a class="dropdown-item cursor" form-submit="workflowListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">삭제</span></a>
                                        <a class="dropdown-item cursor" form-submit="workflowListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">삭제</span></a>
                                    </div>
                                </div>
                            </form>

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

@@ -51,8 +51,8 @@
                                <button aria-expanded="false" aria-haspopup="true" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" type="button"><span translate="common.addFunction" class="ng-scope">추가기능</span>
                                </button>
                                <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu" x-placement="bottom-start">
                                    <a class="dropdown-item cursor ng-isolate-scope" form-submit="departmentListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">엑셀 다운로드</span></a>
                                    <a class="dropdown-item cursor" ng-click="fn.removeDepartments()"> <span translate="common.delete" class="ng-scope">삭제</span></a>
                                    <a class="dropdown-item cursor ng-isolate-scope" form-submit="departmentListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel" class="ng-scope">엑셀 다운로드</span></a>
                                    <a class="dropdown-item cursor" ng-click="fn.removeDepartments()"> <span translate="common.selectDelete" class="ng-scope">삭제</span></a>
                                </div>
                            </div>
                        </form>

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

@@ -51,8 +51,8 @@
                                <button aria-expanded="false" aria-haspopup="true" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" type="button"><span translate="common.addFunction" class="ng-scope">추가기능</span>
                                </button>
                                <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu" x-placement="bottom-start">
                                    <a class="dropdown-item cursor ng-isolate-scope" form-submit="userLevelListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">엑셀 다운로드</span></a>
                                    <a class="dropdown-item cursor" ng-click="fn.removeLevels()"> <span translate="common.delete" class="ng-scope">삭제</span></a>
                                    <a class="dropdown-item cursor ng-isolate-scope" form-submit="userLevelListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel" class="ng-scope">엑셀 다운로드</span></a>
                                    <a class="dropdown-item cursor" ng-click="fn.removeLevels()"> <span translate="common.selectDelete" class="ng-scope">삭제</span></a>
                                </div>
                            </div>
                        </form>