From 12e19e0b8bc5e728169dad54c132e7ccd41973a4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 14 3월 2022 12:55:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa

---
 src/main/webapp/views/project/projectModify.html |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/views/project/projectModify.html b/src/main/webapp/views/project/projectModify.html
index 6cc203b..ddb763b 100644
--- a/src/main/webapp/views/project/projectModify.html
+++ b/src/main/webapp/views/project/projectModify.html
@@ -20,20 +20,21 @@
                        autocomplete="off"
                        ng-model="vm.form.name"
                        ng-maxlength="50"
-                       input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+                       input-regex="/[^?a-zA-Z0-9/]/"
                        maxlength="50"
                        kr-input
                        required>
                 <small ng-show="projectModifyForm.name.$error.maxlength" class="help-block form-text text-danger" translate="common.upTo50Characters">
                     理쒕� 50湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
                 </small>
-                <small translate="project.limitNameToSpecialCharacters">�봽濡쒖젥�듃 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>
+                <!--<small translate="project.limitNameToSpecialCharacters">�봽濡쒖젥�듃 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
             </div>
 
-            <div class="row">
-                <div class="col-lg-6">
+            <!--<div class="row">-->
+            <div>
+                <div class="form-group">
                     <div class="form-group">
-                        <label for="projectModifyForm2"><span translate="common.period">湲곌컙</span></label>
+                        <label><span translate="common.period">湲곌컙</span></label>
                         <input tabindex="-1"
                                type="text"
                                class="form-control input-readonly"
@@ -50,7 +51,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-lg-6">
+                <!--<div class="col-lg-6">
                     <div class="form-group mb10">
                         <label> <span translate="common.parentProject">�긽�쐞 �봽濡쒖젥�듃</span></label>
                         <js-autocomplete-single data-input-name="project"
@@ -65,7 +66,7 @@
                                             type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }">
                         </js-autocomplete-single>
                     </div>
-                </div>
+                </div>-->
             </div>
             <div class="form-group">
                 <label><span translate="project.projectStatus">�봽濡쒖젥�듃 �긽�깭</span>  <code class="highlighter-rouge">*</code></label>
@@ -112,7 +113,7 @@
                                        search="vm.departmentName"
                                        source="fn.getUserDepartmentList(vm.departmentName, vm.form.departments)"
                                        input-disabled="false"
-                                       translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
+                                       translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
                                        extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
 
                 <div class="select3-selection__choicediv mt-10">

--
Gitblit v1.8.0