fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-12 13:32:16 +09:00
Code Issues Projects Releases Packages Wiki Activity

30일 보다 짧은 기간의 설문조사 문제

Browse source 
30일 보다 유효기간이 짧은 설문조사는 생성이 불가능(UI 상에서)했던 문제 수정.
This commit is contained in:
MinSoo Kim 2016-01-26 18:42:55 +09:00
parent 494652ea55
commit dda216d4f6
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/editor/components/poll_maker/tpl/popup.html
View file

@ -31,9 +31,10 @@ $(function(){
, onSelect:function(){ , onSelect:function(){
$(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,"")); $(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""));
} }
,minDate: new Date("{date('Y-m-d',time()+60*60*24*30)}") ,defaultDate: new Date("{date('Y-m-d',time()+60*60*24*30)}")
,minDate: new Date("{date('Y-m-d',time())}")
}; };
$.extend(option,$.datepicker.regional['{$lang_type}']); $.extend(option,$.datepicker.regional['{str_replace('jp','ja',$lang_type)}']);
$(".inputDate").datepicker(option); $(".inputDate").datepicker(option);
}); });
})(jQuery); })(jQuery);

18
modules/editor/components/poll_maker/tpl/popup.js
View file

@ -7,16 +7,16 @@
* 부모창의 위지윅에디터에 데이터를 삽입 * 부모창의 위지윅에디터에 데이터를 삽입
**/ **/
function completeInsertPoll(ret_obj) { function completeInsertPoll(ret_obj) {
if(typeof(opener)=="undefined") return null; if(typeof(opener)=="undefined") return null;
var fo_obj = get_by_id('fo_component'); var fo_obj = get_by_id('fo_component');
var skin = fo_obj.skin.options[fo_obj.skin.selectedIndex].value; var skin = fo_obj.skin.options[fo_obj.skin.selectedIndex].value;
var poll_srl = ret_obj["poll_srl"]; var poll_srl = ret_obj["poll_srl"];
if(!poll_srl) return null; if(!poll_srl) return null;
var text = "<img src=\"../../../../common/img/blank.gif\" poll_srl=\""+poll_srl+"\" editor_component=\"poll_maker\" skin=\""+skin+"\" style=\"display:block;width:400px;height:300px;border:2px dotted #4371B9;background:url(./modules/editor/components/poll_maker/tpl/poll_maker_component.gif) no-repeat center;\" />"; var text = "<img src=\"../../../../common/img/blank.gif\" poll_srl=\""+poll_srl+"\" editor_component=\"poll_maker\" skin=\""+skin+"\" style=\"display:block;width:400px;height:300px;border:2px dotted #4371B9;background:url(./modules/editor/components/poll_maker/tpl/poll_maker_component.gif) no-repeat center;\" />";
alert(ret_obj['message']); alert(ret_obj['message']);
opener.editorFocus(opener.editorPrevSrl); opener.editorFocus(opener.editorPrevSrl);
@ -24,9 +24,9 @@ function completeInsertPoll(ret_obj) {
opener.editorReplaceHTML(iframe_obj, text); opener.editorReplaceHTML(iframe_obj, text);
opener.editorFocus(opener.editorPrevSrl); opener.editorFocus(opener.editorPrevSrl);
window.close(); window.close();
return null; return null;
} }
jQuery(function($){ jQuery(function($){

2
modules/poll/poll.controller.php
View file

@ -22,7 +22,7 @@ class pollController extends poll
$stop_date = Context::get('stop_date'); $stop_date = Context::get('stop_date');
if($stop_date < date('Ymd')) if($stop_date < date('Ymd'))
{ {
$stop_date = date('YmdHis', $_SERVER['REQUEST_TIME']+60*60*24*365); $stop_date = date('YmdHis', $_SERVER['REQUEST_TIME']+60*60*24*30);
} }
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');