Merge pull request #1168 from bjrambo/pr/ncenterlite-test

알림 더미 테스트시 ajax으로 알림을 생성하지 않고 XE에 직접 요청하도록 개선
This commit is contained in:
BJRambo 2019-04-25 13:52:17 +09:00 committed by GitHub
commit 48949a79e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 16 deletions

View file

@ -127,11 +127,24 @@ class ncenterliteAdminController extends ncenterlite
$args->type = $this->_TYPE_TEST;
$args->target_type = $this->_TYPE_TEST;
$args->target_url = getUrl('');
$args->target_summary = Context::getLang('ncenterlite_thisistest') . rand();
$args->target_summary = Context::getLang('ncenterlite_thisistest');
$args->target_nick_name = $logged_info->nick_name;
$args->regdate = date('YmdHis');
$args->notify = $oNcenterliteController->_getNotifyId($args);
$oNcenterliteController->_insertNotify($args);
$output = $oNcenterliteController->_insertNotify($args);
if(!$output->toBool())
{
return $output;
}
}
if (Context::get('success_return_url'))
{
$this->setRedirectUrl(Context::get('success_return_url'));
}
else
{
$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispNcenterliteAdminTest'));
}
}
@ -154,7 +167,20 @@ class ncenterliteAdminController extends ncenterlite
$args->target_nick_name = $logged_info->nick_name;
$args->regdate = date('YmdHis');
$args->notify = $oNcenterliteController->_getNotifyId($args);
$oNcenterliteController->_insertNotify($args);
$output = $oNcenterliteController->_insertNotify($args);
if(!$output->toBool())
{
return $output;
}
if (Context::get('success_return_url'))
{
$this->setRedirectUrl(Context::get('success_return_url'));
}
else
{
$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispNcenterliteAdminTest'));
}
}
function procNcenterliteAdminDeleteNofity()

View file

@ -29,14 +29,3 @@ function completeGetSkinColorset(ret_obj, response_tags, params, fo_obj)
sel.selectedIndex = selected_index;
}
function doDummyDataInsert()
{
jQuery.exec_json('ncenterlite.procNcenterliteAdminInsertDummyData', {}, function completeGetDummyInfo(ret_obj){alert(ret_obj.message)});
}
function doDummyPushDataInsert()
{
jQuery.exec_json('ncenterlite.procNcenterliteAdminInsertPushData', {}, function completeGetDummyPushInfo(ret_obj){alert(ret_obj.message)});
}

View file

@ -8,14 +8,28 @@
<div class="x_control-group">
<label class="x_control-label">{$lang->ncenterlite_test_mention}</label>
<div class="x_controls">
<label><input type="button" name="dummy" onClick="doDummyDataInsert();" class="x_btn" value="{$lang->ncenterlite_test_make_dummy}"> {$lang->ncenterlite_test_mention_about}</label>
<form action="./" method="post">
<fieldset>
<input type="hidden" name="module" value="ncenterlite" />
<input type="hidden" name="act" value="procNcenterliteAdminInsertDummyData" />
<button type="submit" class="x_btn">{$lang->ncenterlite_test_make_dummy}</button>
</fieldset>
</form>
<p>{$lang->ncenterlite_test_mention_about}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->ncenterlite_test_push}</label>
<div class="x_controls">
<label><input type="button" name="dummy" onClick="doDummyPushDataInsert();" class="x_btn" value="{$lang->ncenterlite_test_make_dummy}"> {$lang->ncenterlite_test_push_about}</label>
<form action="./" method="post">
<fieldset>
<input type="hidden" name="module" value="ncenterlite" />
<input type="hidden" name="act" value="procNcenterliteAdminInsertPushData" />
<button type="submit" class="x_btn">{$lang->ncenterlite_test_make_dummy}</button>
</fieldset>
</form>
<p>{$lang->ncenterlite_test_push_about}</p>
</div>
</div>
</section>