| src/main/webapp/scripts/app/issue/issueDetail.controller.js | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/scripts/components/utils/autoComplete.controller.js | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/views/issue/issueDetail.html | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/views/issue/issueSendMailPartners.html | ●●●●● 패치 | 보기 | raw | blame | 히스토리 |
src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -50,7 +50,7 @@ $scope.fn.setDownTableConfigs = setDownTableConfigs; $scope.fn.containsPartner = containsPartner; $scope.fn.onActivate = onActivate; $scope.fn.issueBack = issueBack; $scope.fn.goParentIssue = goParentIssue; $scope.fn.removeRelationIssue = removeRelationIssue; $scope.fn.removeDownIssue = removeDownIssue; $scope.fn.changeDetailPageRowCount = changeDetailPageRowCount; // 페이지 변경 @@ -146,7 +146,7 @@ } // 상위 이슈 클릭시 상위 이슈로 이동 function issueBack() { function goParentIssue() { var index = $scope.$parent.vm.issueIds.length -2; if (index > -1) { var preIssueId = $scope.$parent.vm.issueIds[index]; @@ -1449,16 +1449,43 @@ } function getParametersAll() { var params = $scope.fn.getParameters(null, $scope.vm.viewer.issueCompanyVos); params = $scope.fn.getParameters(params, $scope.vm.viewer.issueIspVos); params = $scope.fn.getParameters(params, $scope.vm.viewer.issueHostingVos); if (params != null && params.length > 0) { for (let i = 0; i < params.length; i++) { params[i].id = i; var params = []; if ($scope.vm.viewer.issueCompanyVos != null && $scope.vm.viewer.issueCompanyVos.length > 0) { var issueCompany = $scope.fn.getParameters(params, $scope.vm.viewer.issueCompanyVos); if (issueCompany != null && issueCompany.length > 0) { angular.forEach(issueCompany, function (data) { params.push(data); }); } } return params; if ($scope.vm.viewer.issueIspVos != null && $scope.vm.viewer.issueIspVos.length > 0) { var issueIsp = $scope.fn.getParameters(params, $scope.vm.viewer.issueIspVos) if (issueIsp != null && issueIsp.length > 0) { angular.forEach(issueIsp, function (data) { params.push(data); }); } } if ($scope.vm.viewer.issueHostingVos != null && $scope.vm.viewer.issueHostingVos.length > 0) { var issueHosting = $scope.fn.getParameters(params, $scope.vm.viewer.issueHostingVos); if (issueHosting != null && issueHosting.length > 0) { angular.forEach(issueHosting, function (data) { params.push(data); }); } } if (params != null && params.length > 0) { var filterData = params.filter(function(item, idx){ return params.findIndex(function(item2, idx2){ return item.email === item2.email }) == idx; }); for (let i = 0; i < filterData.length; i++) { filterData[i].id = i; } } return filterData; } function getParameters(sourceArr, partnerVos) { src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -101,6 +101,8 @@ // 사용자 삭제 function removeMailTarget(index) { $scope.vm.form.account[0].account.splice(index, 1); $scope.vm.form.account[0].name.splice(index, 1); $scope.vm.form.account[0].id.splice(index, 1); } function formCheck(formInvalid) { @@ -209,25 +211,31 @@ var name = ""; var id = ""; var accountArr = []; var nameArr = []; var idArr =[]; angular.forEach(parameter.partners, function (partner) { id = partner.id; account = partner.account; name = partner.name; if(account != null && account.indexOf(",") !== -1) { //메일주소가 여러개일경우 분리 및 공백 제거 account = partner.account.split(","); for (var i = 0; i < account.length; i++) { accountArr[i] = account[i].trim(); accountArr.push(account[i].trim()); nameArr.push(name); idArr.push(id); } } else { accountArr[0] = account; accountArr.push(account); nameArr.push(name); idArr.push(id); } name = partner.name; }); if(accountArr != null && accountArr.length > 0) { for (var i = 0; i < accountArr.length; i++) { $scope.vm.form.account[0].account[i] = accountArr[i]; $scope.vm.form.account[0].name[i] = name; $scope.vm.form.account[0].id[i] = id; $scope.vm.form.account[0].name[i] = nameArr[i]; $scope.vm.form.account[0].id[i] = idArr[i]; } } } src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -721,7 +721,7 @@ }); for (let i = partners.length - 1 ; i >= 0 ; i--) { filterData.forEach(function (exclude) { if (partners[i] !== null && partners[i].id === exclude) { if (partners[i] != null && partners[i].id === exclude) { partners.splice(i, 1); if (partners[i] == null) { return false; src/main/webapp/views/issue/issueDetail.html
@@ -87,7 +87,7 @@ <div class="support-ticket-content-w" ng-controller="issueDetailController"> <div class="support-ticket-content"> <span ng-if="vm.viewer.parentIssueVo != null" class="badge" ng-style="{'background-color' : '#353535', 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }"> <span class="cursor" ng-click="fn.issueBack()">상위 이슈:{{vm.viewer.parentIssueVo.title}}</span> <span class="cursor" ng-click="fn.goParentIssue()">상위 이슈:{{vm.viewer.parentIssueVo.title}}</span> </span> <div class=""> src/main/webapp/views/issue/issueSendMailPartners.html
@@ -20,7 +20,7 @@ </span> </div> <label class="issue-label mt-10"> <!--<label class="issue-label mt-10"> <span translate="issue.selectPartners">업체 선택</span> <code class="highlighter-rouge">*</code> </label> <js-input-autocomplete data-input-name="mailUsers" @@ -36,7 +36,7 @@ input-disabled="vm.form.account[0].account == null" broad-cast="getMailTarget" extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : 'profile', type : 'partner', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete> type : 'partner', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>--> <div class="form-group mb10 mt-20"> <label for="emailTemplateForm" class="issue-label">
