mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正traits\controller\Jump

Browse Source
This commit is contained in:
thinkphp
2016-05-17 10:06:30 +08:00
parent 7be184a7a5
commit d1f9ab38e2
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
library/traits/controller/Jump.php
View File

@@ -50,18 +50,18 @@ trait Jump
$type = IS_AJAX ? Config::get('default_ajax_return') : Config::get('default_return_type'); $type = IS_AJAX ? Config::get('default_ajax_return') : Config::get('default_return_type');
switch ($type) { switch (strtolower($type)) {
case 'html':
$result = ViewTemplate::instance(Config::get('template'), Config::get('view_replace_str'))
->fetch(Config::get('dispatch_success_tmpl'), $result);
$response = new Response($result, $type);
break;
case 'json': case 'json':
$response = new Json($result); $response = new Json($result);
break; break;
case 'jsonp': case 'jsonp':
$response = new Jsonp($result); $response = new Jsonp($result);
break; break;
case 'html':
$result = ViewTemplate::instance(Config::get('template'), Config::get('view_replace_str'))
->fetch(Config::get('dispatch_success_tmpl'), $result);
default:
$response = new Response($result, $type);
} }
return $response; return $response;
} }
@@ -92,18 +92,18 @@ trait Jump
$type = IS_AJAX ? Config::get('default_ajax_return') : Config::get('default_return_type'); $type = IS_AJAX ? Config::get('default_ajax_return') : Config::get('default_return_type');
switch ($type) { switch (strtolower($type)) {
case 'html':
$result = ViewTemplate::instance(Config::get('template'), Config::get('view_replace_str'))
->fetch(Config::get('dispatch_error_tmpl'), $result);
$response = new Response($result, $type);
break;
case 'json': case 'json':
$response = new Json($result); $response = new Json($result);
break; break;
case 'jsonp': case 'jsonp':
$response = new Jsonp($result); $response = new Jsonp($result);
break; break;
case 'html':
$result = ViewTemplate::instance(Config::get('template'), Config::get('view_replace_str'))
->fetch(Config::get('dispatch_error_tmpl'), $result);
default:
$response = new Response($result, $type);
} }
throw new HttpResponseException($response); throw new HttpResponseException($response);
} }