From eb97c024100641e9f123e647654a7f7167a414db Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 15:32:56 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/resources/system_prod.properties | 4 ++--
src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java | 2 +-
src/main/webapp/views/common/header.html | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
index 3f9f4ec..80b12e2 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
@@ -450,7 +450,7 @@
public void recordRemoveWorkflowToIssueStatus(String oldIssueStatusName, String newIssueStatusName, StringBuilder description) {
description.append("<ul class=\"activity-list\">");
- String title = "<span translate=\"common.upddetectReservationIssueStatusateWorkflowNotExist\">蹂�寃쎈맂 �썙�겕�뵆濡쒖슦�뿉�꽌 �긽�깭媛� 議댁옱�븯吏� �븡�븘 �씠�뒋�쓽 �긽�깭媛� 蹂�寃쎈릺�뿀�뒿�땲�떎.</span>";
+ String title = "<span translate=\"common.updateWorkflowNotExist\">蹂�寃쎈맂 �썙�겕�뵆濡쒖슦�뿉�꽌 �긽�깭媛� 議댁옱�븯吏� �븡�븘 �씠�뒋�쓽 �긽�깭媛� 蹂�寃쎈릺�뿀�뒿�땲�떎.</span>";
// �씠�젰 �젙蹂대�� html �깭洹몃줈 留뚮뱾�뼱 以��떎.
this.makeIssueHistoryHtml(description, title, oldIssueStatusName, newIssueStatusName);
diff --git a/src/main/resources/system_prod.properties b/src/main/resources/system_prod.properties
index faf1461..22e64d0 100644
--- a/src/main/resources/system_prod.properties
+++ b/src/main/resources/system_prod.properties
@@ -71,14 +71,14 @@
# added by zenith at 20200623
use.aws=false
-use.scheduler=false
+use.scheduler=true
# upload path
attached.file.path=/dev-upload/
profile.file.path=/dev-profile
# aws bucket name
-aws.bucket.name=wisestone-test
+aws.bucket.name=files
# aws bucket access key
aws.access.key=AKIARX6BJQMZKUYEEJVD
aws.access.password=eAQvouvSJJFl47h2dkMJji/6OtzsGBGF4h9Df3qH
diff --git a/src/main/webapp/views/common/header.html b/src/main/webapp/views/common/header.html
index 34e2058..519dd8b 100644
--- a/src/main/webapp/views/common/header.html
+++ b/src/main/webapp/views/common/header.html
@@ -59,7 +59,7 @@
-->
<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>
--
Gitblit v1.8.0