Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#369] git trees: fix root path

This commit is contained in:
Alexander Machehin 2015-02-09 20:47:03 +05:00
parent e49dd53f3b
commit 02dd616687
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/angularjs/controllers/git_tree_controller.js vendored
View File

@ -6,12 +6,11 @@ RosaABF.controller('GitTreeCtrl', ['$scope', '$http', '$location', function($sco
$scope.breadcrumb = null; $scope.breadcrumb = null;
$scope.processing = false; $scope.processing = false;
$scope.init = function(project, treeish, path, root_path) { $scope.init = function(project, treeish, path) {
$scope.project = project; $scope.project = project;
$scope.treeish = treeish; $scope.treeish = treeish;
$scope.root_path = root_path;
$scope.path = path; $scope.path = path;
//$scope.getTree(); $scope.refresh();
}; };
$scope.refresh = function(more) { $scope.refresh = function(more) {

2
app/views/projects/git/trees/_show.html.haml
View File

@ -1,6 +1,6 @@
%h3= t 'layout.projects.files_in_project' %h3= t 'layout.projects.files_in_project'
%div{ 'ng-controller' => 'GitTreeCtrl', 'ng-cloak' => true, %div{ 'ng-controller' => 'GitTreeCtrl', 'ng-cloak' => true,
'ng-init' => "init('#{@project.name_with_owner}', '#{@treeish}', '#{@path}', '#{root_path}')" } 'ng-init' => "init('#{@project.name_with_owner}', '#{@treeish}', '#{@path}')" }
.files .files
.pull-left= render 'whereami' .pull-left= render 'whereami'
.pull-right= render 'fork' .pull-right= render 'fork'

5
app/views/projects/git/trees/show.json.jbuilder
View File

@ -24,13 +24,12 @@ else
else else
json.node do json.node do
options = [@project, @treeish, node_path]
if node.is_a?(Grit::Tree) if node.is_a?(Grit::Tree)
json.class_name 'fa-folder' json.class_name 'fa-folder'
json.url tree_path *options json.url tree_path(@project, "#{@treeish}/#{node_path}")
else else
json.class_name 'fa-file-text-o' json.class_name 'fa-file-text-o'
json.url blob_path(*options) json.url blob_path(@project, @treeish, node_path)
json.is_blob true json.is_blob true
end end
json.name node.name json.name node.name