From 0f59a76b263ba6cd79380a729f38bfca92a907dd Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 17:59:17 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/issue/issueListNormal.html | 117 ++++++++++++++++++++++++++--------------------------------
1 files changed, 53 insertions(+), 64 deletions(-)
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index af1d6e4..c8594be 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -36,12 +36,12 @@
</p>
<!-- �봽濡쒖젥�듃 -->
- <issue-search-array-view-element lists="vm.projects"
- type="'project'"></issue-search-array-view-element>
+<!-- <issue-search-array-view-element lists="vm.projects"-->
+<!-- type="'project'"></issue-search-array-view-element>-->
<!-- �씠�뒋 ���엯 -->
- <issue-search-field-key-view-element lists="vm.issueTypes"
- keys="vm.search.issueTypeIds"></issue-search-field-key-view-element>
+<!-- <issue-search-field-key-view-element lists="vm.issueTypes"-->
+<!-- keys="vm.search.issueTypeIds"></issue-search-field-key-view-element>-->
<!-- �씠�뒋 �긽�깭 -->
<issue-search-field-key-view-element lists="vm.issueStatuses"
@@ -124,42 +124,6 @@
ng-model="vm.search.title">
</div>
</div>
-
- <div class="col-lg-3">
- <div class="form-group">
- <label> <span translate="common.project">�봽濡쒖젥�듃</span></label>
- <js-autocomplete-multi data-input-name="projects"
- selected-model="vm.projects"
- search="vm.projectName"
- input-disabled="false"
- translation-texts="{ empty : 'common.emptyProject', selectList : 'common.' }"
- source="fn.getProjectList(vm.projectName, vm.projects, null, null, ['01', '02', '03'])"
- extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '', type : '', maxlength : 100}"></js-autocomplete-multi>
- </div>
- </div>
-
- <div class="col-lg-3">
- <div class="form-group">
- <label> <span translate="issue.issueType">�씠�뒋 ���엯</span></label>
- <ng-dropdown-multiselect class="multiSelect cursor"
- data-input-name="issueStatuses"
- selected-model="vm.search.issueTypeIds"
- options="::vm.issueTypes"></ng-dropdown-multiselect>
- </div>
- </div>
-
- <div class="col-lg-3">
- <div class="form-group">
- <label> <span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label>
- <ng-dropdown-multiselect class="multiSelect cursor"
- data-input-name="issueStatuses"
- selected-model="vm.search.issueStatusIds"
- options="::vm.issueStatuses"></ng-dropdown-multiselect>
- </div>
- </div>
- </div>
-
- <div class="row">
<div class="col-lg-3">
<div class="form-group">
<label> <span translate="issue.issueNumber">�씠�뒋 踰덊샇</span></label>
@@ -185,7 +149,41 @@
ng-model="vm.search.description">
</div>
</div>
+<!-- <div class="col-lg-3">-->
+<!-- <div class="form-group">-->
+<!-- <label> <span translate="common.project">�봽濡쒖젥�듃</span></label>-->
+<!-- <js-autocomplete-multi data-input-name="projects"-->
+<!-- selected-model="vm.projects"-->
+<!-- search="vm.projectName"-->
+<!-- input-disabled="false"-->
+<!-- translation-texts="{ empty : 'common.emptyProject', selectList : 'common.' }"-->
+<!-- source="fn.getProjectList(vm.projectName, vm.projects, null, null, ['01', '02', '03'])"-->
+<!-- extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '', type : '', maxlength : 100}"></js-autocomplete-multi>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="col-lg-3">-->
+<!-- <div class="form-group">-->
+<!-- <label> <span translate="issue.issueType">�씠�뒋 ���엯</span></label>-->
+<!-- <ng-dropdown-multiselect class="multiSelect cursor"-->
+<!-- data-input-name="issueStatuses"-->
+<!-- selected-model="vm.search.issueTypeIds"-->
+<!-- options="::vm.issueTypes"></ng-dropdown-multiselect>-->
+<!-- </div>-->
+<!-- </div>-->
+
+ <div class="col-lg-3">
+ <div class="form-group">
+ <label> <span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label>
+ <ng-dropdown-multiselect class="multiSelect cursor"
+ data-input-name="issueStatuses"
+ selected-model="vm.search.issueStatusIds"
+ options="::vm.issueStatuses"></ng-dropdown-multiselect>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
<div class="col-lg-3">
<div class="form-group">
<label> <span translate="common.priority">�슦�꽑 �닚�쐞</span></label>
@@ -205,9 +203,7 @@
options="::vm.severities"></ng-dropdown-multiselect>
</div>
</div>
- </div>
- <div class="row">
<div class="col-lg-3">
<div class="form-group">
<label> <span translate="common.register">�벑濡앹옄</span></label>
@@ -224,17 +220,22 @@
<div class="col-lg-3">
<div class="form-group">
- <label> <span translate="common.registrationDate">�벑濡앹씪</span></label>
- <input type="text"
- readonly
- class="form-control input-sm input-readonly"
- ng-model="vm.search.registerDateRange"
- modal-form-auto-scroll
- date-format="YY-MM-DD"
- parent-el="'#createdWidget'"
- date-range-picker>
+ <label> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span></label>
+ <js-autocomplete-multi data-input-name="departments"
+ selected-model="vm.departments"
+ search="vm.departmentName"
+ input-disabled="false"
+ source="fn.getUserDepartmentList(vm.departmentName, vm.departments)"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
+ extra-settings="{ displayProp : 'byName' , idProp : 'id', widthable : false, width : '', imageable : true, imagePathProp : 'profile', type : 'department', maxlength : 100 }">
+ </js-autocomplete-multi>
</div>
</div>
+
+ </div>
+
+
+ <div class="row">
<div class="col-lg-3">
<div class="form-group">
@@ -263,19 +264,7 @@
</div>
</div>
- <div class="col-lg-3">
- <div class="form-group">
- <label> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span></label>
- <js-autocomplete-multi data-input-name="departments"
- selected-model="vm.departments"
- search="vm.departmentName"
- input-disabled="false"
- source="fn.getUserDepartmentList(vm.departmentName, vm.departments)"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
- extra-settings="{ displayProp : 'byName' , idProp : 'id', widthable : false, width : '', imageable : true, imagePathProp : 'profile', type : 'department', maxlength : 100 }">
- </js-autocomplete-multi>
- </div>
- </div>
+
<div class="col-lg-3" ng-repeat="customField in vm.customFields">
<label>{{::customField.name}}</label>
--
Gitblit v1.8.0