From 43a910170d8049ef99ba38cc2a81b99cad89fb0d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 10 11월 2021 15:59:17 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/webapp/views/workspace/workspaceDepartmentModify.html |   55 +++++++++++++++++++++----------------------------------
 1 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/src/main/webapp/views/workspace/workspaceDepartmentModify.html b/src/main/webapp/views/workspace/workspaceDepartmentModify.html
index 8b28d33..8312784 100644
--- a/src/main/webapp/views/workspace/workspaceDepartmentModify.html
+++ b/src/main/webapp/views/workspace/workspaceDepartmentModify.html
@@ -1,7 +1,7 @@
-<div class="formModal">
+<div class="formModal" xmlns:cursor="http://www.w3.org/1999/xhtml">
     <div class="modal-header faded smaller">
         <div class="modal-title">
-            <strong>遺��꽌紐� �닔�젙</strong>
+            <strong>遺��꽌 �닔�젙</strong>
         </div>
         <button aria-label="Close" class="close" type="button" ng-click="fn.cancel()">
             <span aria-hidden="true"> &times;</span>
@@ -9,37 +9,24 @@
     </div>
 
     <div class="modal-body">
-        <form role="form" name="departmentModifyForm">
+        <form role="form" name="departmentsModifyForm">
             <div class="form-group">
-                <label for="departmentModifyForm1">
-                    <span translate="common.departmentName">遺��꽌紐�</span>
-                    <code class="highlighter-rouge">*</code>
-                </label>
-                <input id="departmentModifyForm1"
-                       name="name"
-                       type="text"
-                       class="form-control"
-                       autofocus
-                       kr-input
-                       input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
-                       autocomplete="off"
-                       ng-model="vm.form.departmentName"
-                       ng-maxlength="200"
-                       maxlength="200"
-                       required>
-                <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
-            </div>
+                <label><span translate="common.departmentName">遺��꽌紐�</span> </label>
+                <js-autocomplete-multi data-input-name="departments"
+                                       selected-model="vm.form.departments"
+                                       search="vm.departmentName"
+                                       source="fn.getDepartments(vm.departmentName, vm.form.departments)"
+                                       input-disabled="false"> <!--concat 泥댄겕 �븘�슂-->
+                                       <!--translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
+                                       extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : true, imagePathProp : 'profile', type : 'user', maxlength : 100, autoResize : true }"-->
+                </js-autocomplete-multi>
 
-            <div class="form-group">
-                <label>
-                    <span translate="manageDepartment.departmentEx">遺��꽌 �꽕紐�</span>
-                </label>
-                <summernote
-                        class="summernote"
-                        lang="ko-KR"
-                        config="vm.options"
-                        ng-model="vm.form.departmentDescription"
-                        target=".note-editable"></summernote>
+                <div class="select3-selection__choicediv mt-10">
+                    <span class="select3-selection__choice" ng-repeat="department in vm.form.departments">
+                        <span>{{department.name}}</span> <!--遺��꽌 �씠由� 異쒕젰-->
+                        <span class="select3-selection__choice__remove" ng-click="fn.removeDepartments($index)">횞</span>
+                    </span>
+                </div>
             </div>
         </form>
     </div>
@@ -48,9 +35,9 @@
         <button type="button" class="btn btn-md btn-grey" ng-click="fn.cancel()"><span translate="common.cancel">痍⑥냼</span></button>
         <button type="button" class="btn btn-md btn-primary bold"
                 js-short-cut
-                js-short-cut-action="(fn.formCheck(departmentModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
-                ng-disabled="fn.formCheck(departmentModifyForm.$invalid)"
+                js-short-cut-action="(fn.formCheck(departmentsModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
+                ng-disabled="fn.formCheck(departmentsModifyForm.$invalid)"
                 ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
         </button>
     </div>
-</div>
\ No newline at end of file
+</div>

--
Gitblit v1.8.0