From d0124362d1ef600700ea24cdc4463bd87fbba244 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Sun, 27 Dec 2015 00:42:40 +0800
Subject: [PATCH] small fixes for edit

---
 app/controllers/admin/vlogs_controller.rb | 2 +-
 app/views/admin/vlogs/_form.html.erb      | 2 +-
 app/views/admin/vlogs/_index.html.erb     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/vlogs_controller.rb b/app/controllers/admin/vlogs_controller.rb
index 808f027..22e7cda 100644
--- a/app/controllers/admin/vlogs_controller.rb
+++ b/app/controllers/admin/vlogs_controller.rb
@@ -52,7 +52,7 @@ class Admin::VlogsController < OrbitAdminController
 				vlog.save
 			end
 		end
-		redirect_to admin_vlogs_path
+		redirect_to admin_vlogs_path(:page => params[:page])
 	end
 
 	def show
diff --git a/app/views/admin/vlogs/_form.html.erb b/app/views/admin/vlogs/_form.html.erb
index 46e01af..7056563 100644
--- a/app/views/admin/vlogs/_form.html.erb
+++ b/app/views/admin/vlogs/_form.html.erb
@@ -58,7 +58,7 @@
 			<input type="hidden" name="video_dirname" id="video_file_temp_dir" />	
 			<input type="hidden" name="video_filename" id="video_file_temp_name" />	
 			<a href="#videoUploader" role="button" class="btn btn-info" data-toggle="modal">Upload Video</a>
-			<label id="video_file_name"><%= File.basename(@vlog.video.file.path) if !@vlog.new_record? %></label>
+			<label id="video_file_name"><%= File.basename(@vlog.video.file.path) if !@vlog.new_record? && @vlog.type != "youtube" %></label>
       	</div>
       </div>
        <div class="control-group video <%= @vlog.type == "upload" ? "" : "hide" %>" for="upload">
diff --git a/app/views/admin/vlogs/_index.html.erb b/app/views/admin/vlogs/_index.html.erb
index e85b649..f6b0d59 100644
--- a/app/views/admin/vlogs/_index.html.erb
+++ b/app/views/admin/vlogs/_index.html.erb
@@ -33,7 +33,7 @@
 				 <div class="quick-edit">
             <ul class="nav nav-pills">
               <% if can_edit_or_delete?(vlog) %>
-                <li><a href="/admin/vlogs/<%= vlog.id.to_s %>/edit"><%= t(:edit) %></a></li>
+                <li><a href="<%= edit_admin_vlog_path(vlog.id, :page => params[:page]) %>"><%= t(:edit) %></a></li>
                 <li><a href="<%= admin_vlog_path(vlog.id,:page => params[:page]) %>" class="delete text-error" data-method="delete" data-confirm="Are you sure?"><%= t(:delete_) %></a></li>
               <% end %>
             </ul>