devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

외교 메시지는 삭제 할 수 없도록

Browse Source
This commit is contained in:
Hide_D
2018-12-01 18:36:43 +09:00
parent 900f307847
commit 22bcef1310
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/js/msg.js
+1 -1
View File
@@ -518,7 +518,7 @@ function activateMessageForm(){
jQuery(function($){ jQuery(function($){
//tmp_template.html은 추후 msg.js에 통합될 수 있음 //tmp_template.html은 추후 msg.js에 통합될 수 있음
var getTemplate = $.get('js/templates/message.html?7',function(obj){ var getTemplate = $.get('js/templates/message.html?8',function(obj){
messageTemplate = obj; messageTemplate = obj;
}); });
hwe/js/templates/message.html
+1 -1
View File
@@ -12,7 +12,7 @@
</div> </div>
<div class="msg_body"> <div class="msg_body">
<div class="msg_header"> <div class="msg_header">
<%if(msgType != 'diplomacy' && src.id == myGeneralID && now <= last5min && invalidType == 'msg_valid'){%> <%if(msgType != 'diplomacy' && msgType != 'diplomacy' && src.id == myGeneralID && now <= last5min && invalidType == 'msg_valid'){%>
<button type="button" data-erase_until="<%last5min%>" class="btn btn btn-outline-warning btn-sm btn-delete-msg" style='float:right'>❌</button> <button type="button" data-erase_until="<%last5min%>" class="btn btn btn-outline-warning btn-sm btn-delete-msg" style='float:right'>❌</button>
<%}%> <%}%>
<%if(msgType == 'private') {%> <%if(msgType == 'private') {%>
hwe/sammo/Message.php
+4
View File
@@ -275,6 +275,10 @@ class Message
return '본인의 메시지만 삭제할 수 있습니다.'; return '본인의 메시지만 삭제할 수 있습니다.';
} }
if($msgObj->msgType == Message::MSGTYPE_DIPLOMACY){
return '외교 메시지는 삭제할 수 없습니다.';
}
$prev5min = new \DateTime(); $prev5min = new \DateTime();
$prev5min->sub(new \DateInterval('PT5M')); $prev5min->sub(new \DateInterval('PT5M'));