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
c8d53abb
Commit
c8d53abb
authored
Jul 09, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加媒资类别列表
parent
c04306c2
Pipeline
#9846
passed with stages
in 33 seconds
Changes
5
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
MediaController.php
app/Http/Controllers/Api/Client/MediaController.php
+1
-1
MediaCategoryController.php
app/Http/Controllers/Web/MediaCategoryController.php
+2
-2
MediaModel.php
app/Model/MediaModel.php
+1
-1
media_edit.blade.php
resources/views/admin/media/media_edit.blade.php
+2
-2
list.blade.php
resources/views/admin/media_category/list.blade.php
+0
-0
No files found.
app/Http/Controllers/Api/Client/MediaController.php
View file @
c8d53abb
...
@@ -98,7 +98,7 @@ class MediaController extends Controller
...
@@ -98,7 +98,7 @@ class MediaController extends Controller
SrsHookValidate
::
srsHookCallback
(
$request
,[
SrsHookValidate
::
srsHookCallback
(
$request
,[
'media_name'
=>
'required'
,
'media_name'
=>
'required'
,
'media_type'
=>
'required'
,
'media_type'
=>
'required'
,
'media_id'
=>
'required'
,
'media_id'
=>
'required'
,
'access_key'
=>
''
,
'access_key'
=>
''
,
'secret_key'
=>
''
,
'secret_key'
=>
''
,
...
...
app/Http/Controllers/Web/MediaCategoryController.php
View file @
c8d53abb
...
@@ -16,9 +16,9 @@ class MediaCategoryController extends Controller
...
@@ -16,9 +16,9 @@ class MediaCategoryController extends Controller
$catgList
=
MediaCategoryModel
::
catgListPage
(
$request
);
$catgList
=
MediaCategoryModel
::
catgListPage
(
$request
);
return
$catgList
;
return
$catgList
;
});
});
$data
[
'name'
]
=
$request
->
name
;
$data
[
'media_categories'
]
=
$result
;
$data
[
'media_categories'
]
=
$result
;
return
view
(
'admin.media_category.list'
);
return
view
(
'admin.media_category.list'
,
$data
);
}
}
}
}
app/Model/MediaModel.php
View file @
c8d53abb
...
@@ -145,7 +145,7 @@ class MediaModel extends Eloquent
...
@@ -145,7 +145,7 @@ class MediaModel extends Eloquent
*/
*/
$media_info
=
explode
(
"&"
,
$request
->
media_name
);
$media_info
=
explode
(
"&"
,
$request
->
media_name
);
$mediaCatg
=
MediaCategoryModel
::
where
(
'
_id
'
,
$request
->
media_type
)
->
first
();
$mediaCatg
=
MediaCategoryModel
::
where
(
'
name
'
,
$request
->
media_type
)
->
first
();
if
(
empty
(
$mediaCatg
)){
if
(
empty
(
$mediaCatg
)){
throw
new
\Exception
(
"媒资类别不存在"
);
throw
new
\Exception
(
"媒资类别不存在"
);
}
}
...
...
resources/views/admin/media/media_edit.blade.php
View file @
c8d53abb
...
@@ -61,9 +61,9 @@
...
@@ -61,9 +61,9 @@
@foreach($media_types as $media_type)
@foreach($media_types as $media_type)
@if($media_type['name'] == $media['media_type'])
@if($media_type['name'] == $media['media_type'])
<option
value=
"{{$media
['media_type_id
']}}"
selected
>
{{$media_type['name']}}
</option>
<option
value=
"{{$media
_type['name
']}}"
selected
>
{{$media_type['name']}}
</option>
@else
@else
<option
value=
"{{$media
['media_type_id
']}}"
>
{{$media_type['name']}}
</option>
<option
value=
"{{$media
_type['name
']}}"
>
{{$media_type['name']}}
</option>
@endif
@endif
@endforeach
@endforeach
...
...
resources/views/admin/media_category/list.blade.php
View file @
c8d53abb
This diff is collapsed.
Click to expand it.
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