From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 01 12월 2021 13:23:09 +0900 Subject: [PATCH] 충돌 수정 --- src/main/webapp/views/issue/issueDetail.html | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html index cad525e..765c919 100644 --- a/src/main/webapp/views/issue/issueDetail.html +++ b/src/main/webapp/views/issue/issueDetail.html @@ -192,6 +192,11 @@ <span class="issue-detail-label" style="position: relative; top: 1rem" ng-show="vm.viewer.issueCustomFields == ''">�궗�슜�옄 �젙�쓽 �븘�뱶媛믪씠 �뾾�뒿�땲�떎.</span> </div> </div> + <div class="col-md-2"> + <issue-detail-image-preview images="vm.images"></issue-detail-image-preview> + </div> + <div ng-show="vm.images.length < 1" class="detail-not-elements width-100"> + </div> </div> <!-- �궗�슜�옄 �젙�쓽 �븘�뱶 --> <div class="row"> @@ -256,13 +261,9 @@ </div> </div> </div> - <div class="pdt0" style="position: relative; bottom: 1rem"> - <issue-detail-image-preview images="vm.images"></issue-detail-image-preview> - </div> - <div ng-show="vm.images.length < 1" class="detail-not-elements width-100"> - <span></span> - </div> + </div> + <!-- <div class=""> <label class="issue-detail-label"><span>{{vm.viewer.issueCustomFieldValueVos[0].useValue}}</span> </label> @@ -312,7 +313,7 @@ <div class="form-group"> <div class=""> <span translate="companyField.email">�씠硫붿씪</span>: - <span class="email_color">{{vm.viewer.issueCompanyVos[0].email}}</span> + <span class="email_color cursor" ng-click="fn.sendMail(vm.viewer.id, vm.viewer.projectVo.id)">{{vm.viewer.issueCompanyVos[0].email}}</span> </div> </div> </div> @@ -372,7 +373,7 @@ <div class="form-group"> <div class=""> <span translate="ispField.email">�씠硫붿씪</span>: - <span class="email_color">{{vm.viewer.issueIspVos[0].email}}</span> + <span class="email_color cursor" ng-click="fn.sendMail(vm.viewer.id, vm.viewer.projectVo.id)">{{vm.viewer.issueIspVos[0].email}}</span> </div> </div> </div> @@ -433,7 +434,7 @@ <div class="form-group"> <div class=""> <span translate="hostingField.email">�씠硫붿씪</span>: - <span class="email_color">{{vm.viewer.issueHostingVos[0].email}}</span> + <span class="email_color cursor" ng-click="fn.sendMail(vm.viewer.id, vm.viewer.projectVo.id)">{{vm.viewer.issueHostingVos[0].email}}</span> </div> </div> </div> -- Gitblit v1.8.0