Ver Fonte

Merge pull request #1751 from visuddhinanda/laravel

search 只使用tulip
visuddhinanda há 2 anos atrás
pai
commit
3b0c8120a1

+ 1 - 5
app/Http/Controllers/SearchController.php

@@ -36,11 +36,7 @@ class SearchController extends Controller
                 if(substr($key,0,4) === 'para' || in_array(substr($key,0,1),$pageHead)){
                 if(substr($key,0,4) === 'para' || in_array(substr($key,0,1),$pageHead)){
                     return $this->page($request);
                     return $this->page($request);
                 }else{
                 }else{
-                    if (App::environment(['local', 'staging'])) {
-                        return $this->pali_rpc($request);
-                    }else{
-                        return $this->pali($request);
-                    }
+                    return $this->pali_rpc($request);
                 }
                 }
                 break;
                 break;
             case 'page':
             case 'page':

+ 3 - 1
app/Http/Resources/SentResource.php

@@ -58,7 +58,9 @@ class SentResource extends JsonResource
                                              null,
                                              null,
                                              $mode,
                                              $mode,
                                              $channel['type'],
                                              $channel['type'],
-                                             $this->content_type);
+                                             $this->content_type,
+                                             $request->get('format','react')
+                                            );
         }
         }
         if($request->get('mode') === "edit" || $request->get('mode') === "wbw"){
         if($request->get('mode') === "edit" || $request->get('mode') === "wbw"){
             $data['suggestionCount'] = SuggestionApi::getCountBySent($this->book_id,
             $data['suggestionCount'] = SuggestionApi::getCountBySent($this->book_id,