Fix bug of json request url

1 files changed, 10 insertions, 3 deletions

diff --git a/app/controllers/projects/network_controller.rb b/app/controllers/projects/network_controller.rb
index e29e5994c4b..e808c9c7343 100644
--- a/app/controllers/projects/network_controller.rb
+++ b/app/controllers/projects/network_controller.rb
@@ -5,16 +5,16 @@ class Projects::NetworkController < Projects::ApplicationController
   before_action :require_non_empty_project
   before_action :assign_ref_vars
   before_action :authorize_download_code!
+  before_action :assign_extended_sha1
 
   def show
     @url = namespace_project_network_path(@project.namespace, @project, @ref, @options.merge(format: :json))
     @commit_url = namespace_project_commit_path(@project.namespace, @project, 'ae45ca32').gsub("ae45ca32", "%s")
-    @commit = @repo.commit(params[:extended_sha1]) if params[:extended_sha1].present?
 
     respond_to do |format|
       format.html do
-        if params[:extended_sha1].present? && !@commit
-          flash.now[:alert] = "Git revision '#{params[:extended_sha1]}' does not exist."
+        if @options[:extended_sha1] && !@commit
+          flash.now[:alert] = "Git revision '#{@options[:extended_sha1]}' does not exist."
         end
       end
 
@@ -23,4 +23,11 @@ class Projects::NetworkController < Projects::ApplicationController
       end
     end
   end
+
+  def assign_extended_sha1
+    return if params[:extended_sha1].blank?
+
+    @options[:extended_sha1] = params[:extended_sha1]
+    @commit = @repo.commit(@options[:extended_sha1])
+  end
 end