diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-02-23 17:52:21 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-02-23 17:52:21 +0300 |
commit | 6263a3ca3c66c06c7776c6f6e50bde17a6a60a33 (patch) | |
tree | 291940414625e53f5db6c4f4e81059c9890914e7 | |
parent | 1ff17b6bba801138ae260425381d13e6ce427396 (diff) | |
parent | 01b965f6daf22eaeb511d35d3312c217cb1f2d33 (diff) |
Merge branch 'files-view-row-click' into 'master'
Fixes issue with file view rows not clickable on project main view
Fixed an issue where it would only load the first 25 commit data on project main view.
Stopped the file view sending 1 too many requests.
Fixes #3916
See merge request !2933
-rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 2 | ||||
-rw-r--r-- | app/controllers/projects/refs_controller.rb | 6 | ||||
-rw-r--r-- | app/views/projects/refs/logs_tree.js.haml | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index 407005d8adf..4c6cf3417e8 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -76,6 +76,8 @@ class Dispatcher shortcut_handler = new ShortcutsNavigation() when 'projects:show' shortcut_handler = new ShortcutsNavigation() + + new TreeView() if $('#tree-slider').length when 'groups:show' new Activities() shortcut_handler = new ShortcutsNavigation() diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb index a8f091819ca..00df1c9c965 100644 --- a/app/controllers/projects/refs_controller.rb +++ b/app/controllers/projects/refs_controller.rb @@ -64,9 +64,9 @@ class Projects::RefsController < Projects::ApplicationController } end - if @logs.present? - @log_url = namespace_project_tree_url(@project.namespace, @project, tree_join(@ref, @path || '/')) - @more_log_url = logs_file_namespace_project_ref_path(@project.namespace, @project, @ref, @path || '', offset: (@offset + @limit)) + offset = (@offset + @limit) + if contents.size > offset + @more_log_url = logs_file_namespace_project_ref_path(@project.namespace, @project, @ref, @path || '', offset: offset) end respond_to do |format| diff --git a/app/views/projects/refs/logs_tree.js.haml b/app/views/projects/refs/logs_tree.js.haml index db7f244d002..8ee2aef0e61 100644 --- a/app/views/projects/refs/logs_tree.js.haml +++ b/app/views/projects/refs/logs_tree.js.haml @@ -8,12 +8,9 @@ row.find("td.tree_time_ago").html('#{escape_javascript time_ago_with_tooltip(commit.committed_date)}'); row.find("td.tree_commit").html('#{escape_javascript render("projects/tree/tree_commit_column", commit: commit)}'); -- if @logs.present? +- if @more_log_url :plain - var current_url = location.href.replace(/\/?$/, '/'); - var log_url = "#{escape_javascript(@log_url)}".replace(/\/?$/, '/'); - - if(current_url == log_url) { + if($('#tree-slider').length) { // Load more commit logs for each file in tree // if we still on the same page var url = "#{escape_javascript(@more_log_url)}"; |