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/scripts/components/utils/issueSearchFieldKeyViewElement.directive.js | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/scripts/components/utils/issueSearchFieldKeyViewElement.directive.js b/src/main/webapp/scripts/components/utils/issueSearchFieldKeyViewElement.directive.js
index 92ee0a0..5c4ae0c 100644
--- a/src/main/webapp/scripts/components/utils/issueSearchFieldKeyViewElement.directive.js
+++ b/src/main/webapp/scripts/components/utils/issueSearchFieldKeyViewElement.directive.js
@@ -51,9 +51,14 @@
break;
}
}
-
- makeTag += "<span ng-click='fn.remove(" + key.fieldKey + ")'>횞</span>";
- makeTag += "</p>";
+ if (target.fieldValue !== null) {
+ makeTag += "<span></span>";
+ makeTag += "</p>";
+ }
+ else {
+ makeTag += "<span ng-click='fn.remove(" + key.fieldKey + ")'>횞</span>";
+ makeTag += "</p>";
+ }
});
var linkFn = $compile(makeTag);
--
Gitblit v1.8.0