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

이민희

2021-12-15 d8a2bc3c8fe4cb8656abbf90fdc22e3ace1a82f3

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

 src/main/webapp/custom_components/js-autocomplete-multi/js-autocomplete-multi.js

@@ -101,6 +101,10 @@
                            var parentFound = false;

                            while (angular.isDefined(target) && target !== null && !parentFound && target.className !== null) {
                                if (typeof target.className.split != 'function') {
                                    break;
                                }

                                if (_.contains(target.className.split(' '), 'multiselect-parent') && !parentFound) {
                                    if (target === $dropdownTrigger) {
                                        parentFound = true;

 src/main/webapp/custom_components/js-workflow/js-workflow.directive.js

@@ -669,24 +669,27 @@
                            if ($scope.vm.activeTarget != null) {
                                var targetIssueStatus = $scope.vm.activeTarget.issueStatus;

                                var myIssueStatus = null;
                                angular.forEach($scope.vm.issueStatusVos, function (issueStatusVo) {
                                    if (issueStatusVo.id === targetIssueStatus.id) {
                                        myIssueStatus = issueStatusVo;
                                    }
                                });
                                // null 체크
                                if (targetIssueStatus != null) {
                                    var myIssueStatus = null;
                                    angular.forEach($scope.vm.issueStatusVos, function (issueStatusVo) {
                                        if (issueStatusVo.id === targetIssueStatus.id) {
                                            myIssueStatus = issueStatusVo;
                                        }
                                    });

                                if (myIssueStatus != null) {
                                    if ($scope.vm.departments != null) {
                                        var workflowDepartments = [];
                                    if (myIssueStatus != null) {
                                        if ($scope.vm.departments != null) {
                                            var workflowDepartments = [];

                                        angular.forEach($scope.vm.departments, function (department) {
                                            var workflowDepartment = {
                                                departmentVo : department
                                            }
                                            workflowDepartments.push(workflowDepartment);
                                        });
                                        myIssueStatus.workflowDepartmentVos = workflowDepartments;
                                            angular.forEach($scope.vm.departments, function (department) {
                                                var workflowDepartment = {
                                                    departmentVo : department
                                                }
                                                workflowDepartments.push(workflowDepartment);
                                            });
                                            myIssueStatus.workflowDepartmentVos = workflowDepartments;
                                        }
                                    }
                                }
                            }

 src/main/webapp/custom_components/js-workflow/js-workflow.html

@@ -60,7 +60,7 @@
                </div>
            </div>

            <div class="form-group" ng-if="vm.activeTarget != null">
            <div class="form-group" ng-if="vm.activeTarget != null" ng-hide="vm.activeTarget.colorClass != null">
                <label><span translate="project.projectDepartment">부서명</span><span>[{{vm.activeTarget.name}}]</span></label>
                <js-autocomplete-multi data-input-name="departments"
                                       selected-model="vm.departments"

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

@@ -97,7 +97,7 @@
            <span class="ticket-header">
                <div class="tasks-header-w">
                    <span class="tags">
                        <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} &nbsp; / &nbsp; {{vm.viewer.projectVo.name}} &nbsp; / &nbsp; <span>API :&nbsp;{{vm.viewer.isApi}}</span></span>
                        <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} &nbsp; / &nbsp; {{vm.viewer.projectVo.name}} &nbsp; <span ng-if="vm.viewer.isApi == 'Y'">/</span> &nbsp; <span ng-if="vm.viewer.isApi == 'Y'" class="badge" ng-style="{'background-color' : '#EF8D9A', 'border-color' : '#EF8D9A', 'color' : '#FFFFFF' }">API</span></span>
                    </span>
                </div>
            </span>
@@ -324,6 +324,15 @@
                    <div class="col-sm-2">
                        <div class="form-group">
                            <div class="">
                                <span translate="companyField.url">url</span>:
                                <span>{{vm.viewer.issueCompanyVos[0].url}}</span>
                            </div>
                        </div>
                    </div>

                    <div class="col-sm-2">
                        <div class="form-group">
                            <div class="">
                                <span translate="companyField.memo">비고</span>:
                                <span>{{vm.viewer.issueCompanyVos[0].memo}}</span>
                            </div>
@@ -378,6 +387,15 @@
                            <div class="">
                                <span translate="ispField.email">이메일</span>:
                                <span class="email_color cursor" ng-click="fn.sendMailVo(vm.viewer.issueIspVos)">{{vm.viewer.issueIspVos[0].email}}</span>
                            </div>
                        </div>
                    </div>

                    <div class="col-sm-2">
                        <div class="form-group">
                            <div class="">
                                <span translate="companyField.url">url</span>:
                                <span>{{vm.viewer.issueIspVos[0].url}}</span>
                            </div>
                        </div>
                    </div>
@@ -447,6 +465,15 @@
                    <div class="col-sm-2">
                        <div class="form-group">
                            <div class="">
                                <span translate="companyField.url">url</span>:
                                <span>{{vm.viewer.issueHostingVos[0].url}}</span>
                            </div>
                        </div>
                    </div>

                    <div class="col-sm-2">
                        <div class="form-group">
                            <div class="">
                                <span translate="hostingField.memo">비고</span>:
                                <span>{{vm.viewer.issueHostingVos[0].memo}}</span>
                            </div>