Skip to content

M
media-resource
Commit fc81ccec by 杨昕
Options

Merge branch 'test' into 'master' 

屏蔽视频时长没有问题

See merge request !35
parents cb1e646d 0d85ea26
Pipeline #13927 passed with stages
in 42 seconds
Showing with 8 additions and 2 deletions
app/Model/MediaModel.php
......@@ -347,7 +347,7 @@ class MediaModel extends Eloquent
'description' => $request->description,
'start_time' => $request->start_time?$start_time:$media['start_time'],
'end_time' => $request->end_time?$end_time:$media['start_time'],
'duration' => $request->duration??"0",
//'duration' => $request->duration??"0",
];
}else{
......@@ -365,9 +365,15 @@ class MediaModel extends Eloquent
'description' => $request->description,
'start_time' => $request->start_time?$start_time:$media['start_time'],
'end_time' => $request->end_time?$end_time:$media['start_time'],
'duration' => $request->duration??"0",
// 'duration' => $request->duration??"0",
];
}
$media_duration=$request->duration??"0";
if($media_duration!=0)
{
$data['duration']=$request->duration;
}
$flag = MediaModel::where("_id",$id)->update($data);
if (!$flag){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment