Переглянути джерело

channel 支持两种分隔符 , _

visuddhinanda 2 роки тому
батько
коміт
340b023376

+ 10 - 2
app/Http/Controllers/CorpusController.php

@@ -233,7 +233,11 @@ class CorpusController extends Controller
         }
 
         if($request->has('channels')){
-            $getChannel = explode(",",$request->get('channels'));
+            if(strpos($request->get('channels'),',') === FALSE){
+                $getChannel = explode('_',$request->get('channels'));
+            }else{
+                $getChannel = explode(',',$request->get('channels'));
+            }
             $channels = array_merge($channels,$getChannel );
         }
         $para = explode(",",$request->get('par'));
@@ -319,7 +323,11 @@ class CorpusController extends Controller
         $sentId = \explode('-',$id);
         $channels = [];
         if($request->has('channels')){
-            $channels = explode('_',$request->get('channels'));
+            if(strpos($request->get('channels'),',') === FALSE){
+                $channels = explode('_',$request->get('channels'));
+            }else{
+                $channels = explode(',',$request->get('channels'));
+            }
         }
         $mode = $request->get('mode','read');
         if($mode === 'read'){

+ 5 - 1
app/Http/Resources/TocResource.php

@@ -31,7 +31,11 @@ class TocResource extends JsonResource
             $data['title'] = $title;
         }
         if($request->has('channels')){
-            $channels = explode(',',$request->get('channels'));
+            if(strpos($request->get('channels'),',') ===FALSE){
+                $channels = explode('_',$request->get('channels'));
+            }else{
+                $channels = explode(',',$request->get('channels'));
+            }
             $title= ProgressChapter::where('book',$this->book)
                                 ->where('para',$this->paragraph)
                                 ->where('channel_id',$channels[0])