Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
media-resource
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨昕
media-resource
Commits
349d0e0a
Commit
349d0e0a
authored
Apr 09, 2021
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化添加修改媒资
parent
fc72b7ec
Pipeline
#14157
passed with stages
in 8 minutes 3 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
MediaController.php
app/Http/Controllers/Api/Client/MediaController.php
+2
-0
MediaController.php
app/Http/Controllers/Web/MediaController.php
+1
-0
MediaModel.php
app/Model/MediaModel.php
+4
-2
No files found.
app/Http/Controllers/Api/Client/MediaController.php
View file @
349d0e0a
...
...
@@ -120,6 +120,8 @@ class MediaController extends Controller
'end_time.after_or_equal'
=>
'结束时间不能小于开始时间'
]);
$request
->
replace
(
array_merge
(
$request
->
all
(),[
'status'
=>
"1"
]));
$id
=
MediaModel
::
hookRestoreMedia
(
$request
);
...
...
app/Http/Controllers/Web/MediaController.php
View file @
349d0e0a
...
...
@@ -143,6 +143,7 @@ class MediaController extends Controller
'start_time'
=>
$data_time
,
'end_time'
=>
$data_time
,
'create_time'
=>
$data_time
,
'status'
=>
"1"
,
);
$request
->
replace
(
array_merge
(
$request
->
all
(),
$params
));
...
...
app/Model/MediaModel.php
View file @
349d0e0a
...
...
@@ -253,7 +253,8 @@ class MediaModel extends Eloquent
'user_id'
=>
$request
->
token_user_id
,
'start_time'
=>
$start_time
,
'end_time'
=>
$end_time
,
'duration'
=>
$request
->
duration
??
"0"
'duration'
=>
$request
->
duration
??
"0"
,
'status'
=>
$request
->
status
??
"0"
,
];
}
else
{
...
...
@@ -274,7 +275,8 @@ class MediaModel extends Eloquent
'user_id'
=>
$request
->
token_user_id
,
'start_time'
=>
$start_time
,
'end_time'
=>
$end_time
,
'duration'
=>
$request
->
duration
??
"0"
'duration'
=>
$request
->
duration
??
"0"
,
'status'
=>
$request
->
status
??
"0"
,
];
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment