From bdb1efdc604fce543e21152b4263a9362f64389f Mon Sep 17 00:00:00 2001 From: minhee <alsdldlfrl@gmail.com> Date: 목, 10 3월 2022 15:35:19 +0900 Subject: [PATCH] - api 이슈 추가 시 입력한 ip에 속해있는 업체정보를 가진 이슈의 하위로 입력되도록 수정 - issue_company 테이블에 ip 컬럼 추가 및 이슈 추가/수정 시 ip 대역대 항목 추가 --- src/main/webapp/views/common/header.html | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/views/common/header.html b/src/main/webapp/views/common/header.html index 34e2058..9875edd 100644 --- a/src/main/webapp/views/common/header.html +++ b/src/main/webapp/views/common/header.html @@ -42,8 +42,7 @@ </div> - <!-- �쟾泥� �봽濡쒖젥�듃 �씪�븣 �씠�뒋 留뚮뱾湲� 踰꾪듉 �닲源� --> - <button class="btn btn-xlg btn-primary btn-rounded mr-10 ml-3" ng-if="$root.workProject.id > -1" ng-click="fn.addIssue()" tabindex="-1"> + <button class="btn btn-xlg btn-primary btn-rounded mr-10 ml-3" ng-click="fn.addIssue()" tabindex="-1"> <i class="os-icon os-icon-plus"></i> <span translate="issue.createIssue">�씠�뒋 留뚮뱾湲�</span> </button> @@ -59,8 +58,11 @@ --> <div class="messages-notifications os-dropdown-trigger os-dropdown-position-left" ui-sref="notices.list" style="padding-top:5px;"> - <span class="new-messages-push"></span> +<!-- <span class="new-messages-push"></span>--> <i class="dripicons-broadcast"></i> + </div> + <div class="messages-notifications os-dropdown-trigger os-dropdown-position-left"> + <i class="os-icon os-icon-email-2-at2 mr-20" ng-click="fn.sendCommonMail()" data-toggle="tooltip" data-placement="right" title="吏곸젒 �옉�꽦�븳 硫붿씪 蹂대궡湲�"></i> </div> <!-- @@ -76,14 +78,14 @@ --> - <select class="form-control rounded width-80-p" +<!-- <select class="form-control rounded width-80-p" ng-model="$root.language" tabindex="-1" ng-change="$root.changeLocale($root.language)"> <option value="ko" translate="common.korean"> �븳援��뼱 </option> - <!--<option value="en" translate="common.english"> + <option value="en" translate="common.english"> �쁺�뼱 </option> <option value="ja" translate="common.japaneseLanguage"> @@ -91,8 +93,8 @@ </option> <option value="vi" translate="common.vietnamese"> 踰좏듃�궓�뼱 - </option>--> - </select> + </option> + </select>--> </div> </div> </div> -- Gitblit v1.8.0