chiu
/
video_pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chiu:master
Branches Tags
chiu:master
..
compare: chiu:dev
Branches Tags
chiu:master

No commits in common. "master" and "dev" have entirely different histories.
master ... dev

3 changed files with 1 additions and 12 deletions
Show Stats Expand all files Collapse all files

2
app/controllers/admin/video_pros_controller.rb
View File

@ -77,7 +77,7 @@ class Admin::VideoProsController < OrbitAdminController
end end
def create_get_video_tags(video) def create_get_video_tags(video)
new_tags = params["video_tags"].present? ? params["video_tags"].split(",") : [] new_tags = params["video_tags"].split(",")
tags = [] tags = []
video.video_tags = [] video.video_tags = []
new_tags.each do |tag| new_tags.each do |tag|

4
app/models/video_image.rb
View File

@ -202,10 +202,6 @@ class VideoImage
I18n.t("announcement.status.hidden") I18n.t("announcement.status.hidden")
end end
def get_other_member_profiles_names_for_frontend
MemberProfile.find(self.other_member_profiles).map{|m,n| {"name" => m.name}} rescue []
end
def get_snapshot_url def get_snapshot_url
# self.video_snapshot.url rescue "" # self.video_snapshot.url rescue ""
self.is_youtube ? self.file.url : (self.video_snapshot.url) self.is_youtube ? self.file.url : (self.video_snapshot.url)

7
app/views/video_pros/show.html.erb
View File

@ -66,13 +66,6 @@
<span><img src="<%= view_icon_url %>" alt="<%= view_count_trans %>">x <%= view_count %></span> <span><img src="<%= view_icon_url %>" alt="<%= view_count_trans %>">x <%= view_count %></span>
</div> </div>
</div> </div>
<div class="other_member_profiles">
<% video_image.get_other_member_profiles_names_for_frontend.each do |profile| %>
<div class="other_profile">
<span class="other_profile_name"><%= profile["name"] %></span>
</div>
<% end %>
</div>
<style> <style>
.video_box_wrap{ .video_box_wrap{
height: 0; height: 0;