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/projectAdd.html | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/project/projectAdd.html b/src/main/webapp/views/project/projectAdd.html
index d2315af..44e3b4f 100644
--- a/src/main/webapp/views/project/projectAdd.html
+++ b/src/main/webapp/views/project/projectAdd.html
@@ -19,7 +19,7 @@
autofocus
autocomplete="off"
ng-model="vm.form.name"
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ input-regex="/[^?a-zA-Z0-9/]/"
ng-maxlength="50"
maxlength="50"
kr-input
@@ -27,7 +27,7 @@
<small ng-show="projectAddForm.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="form-group">
@@ -64,8 +64,9 @@
</small>
</div>
- <div class="row">
- <div class="col-lg-6">
+ <!--<div class="row">-->
+ <div>
+ <div class="form-group">
<div class="form-group">
<label><span translate="common.period">湲곌컙</span></label>
<input tabindex="-1"
@@ -142,9 +143,8 @@
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">
- <span class="select3-selection__choice" ng-repeat="user in vm.form.users">
+ <span class="select3-selection__choice" ng-repeat="department in vm.form.departments">
<span>{{department.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
<span class="select3-selection__choice__remove" ng-click="fn.removeDepartment($index)">횞</span>
</span>
--
Gitblit v1.8.0