From 743fb98986d528be8b3b5bfd6d99fb1cabcd82b9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 21:44:45 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/views/issue/issueDetail.html             |    2 +-
 src/main/webapp/scripts/app/issue/issueAdd.controller.js |    5 ++++-
 src/main/webapp/views/common/header.html                 |    8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 5b4e9e7..6d498ec 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -665,6 +665,7 @@
                         fileFormDataName : "file"
                     }).then(function (result) {
                         if (result.data.message.status === "success") {
+
                             //  �뿰�냽 �벑濡� 泥댄겕�떆 �씠�룞�븯吏� �븡�쓬.
                             if ($scope.vm.infiniteAdd) {
                                 $scope.fn.infiniteAddForm();
@@ -673,7 +674,9 @@
                                 $scope.fn.cancel();
 
                                 if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
-                                    $state.go("issues.list");
+                                    $state.go($state.current, {}, {reload : true});
+                                    // $state.go("issues.list");
+                                    // $state.go("dashboards.dashboard")
                                 }
                             }
 
diff --git a/src/main/webapp/views/common/header.html b/src/main/webapp/views/common/header.html
index 519dd8b..3ac7524 100644
--- a/src/main/webapp/views/common/header.html
+++ b/src/main/webapp/views/common/header.html
@@ -76,14 +76,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 +91,8 @@
                 </option>
                 <option value="vi" translate="common.vietnamese">
                     踰좏듃�궓�뼱
-                </option>-->
-            </select>
+                </option>
+            </select>-->
         </div>
     </div>
 </div>
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 71aff7d..3306fed 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -109,7 +109,7 @@
                 <i class="os-icon os-icon-edit-1 mr-20" ng-click="fn.modify(vm.viewer.id)"
                    ng-if="vm.viewer.modifyPermissionCheck && vm.viewer.issueStatusVo.issueStatusType != 'CLOSE'" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �닔�젙 �븯湲�"></i>
                 <!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �뮘濡쒓�湲� 踰꾪듉 �깮�꽦 -->
-                <span ng-if="vm.viewer.parentIssueVo.id != null" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-arrow-left7" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �뮘濡� �씠�룞"></i></span>
+<!--                <span ng-if="vm.viewer.parentIssueVo.id != null" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-arrow-left7" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �뮘濡� �씠�룞"></i></span>-->
                 <!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �긽�꽭�솕硫� �떕湲곕쾭�듉 �쐞移� 議곗젙 -->
                 <span class="issue-close" ng-click="fn.listView()"><i class="os-icon os-icon-close" data-toggle="tooltip" data-placement="left" title="�긽�꽭 �솕硫� �떕湲�"></i></span>
             </a>

--
Gitblit v1.8.0