From 9b7be451576b07bf63c701918bd0a01a52d24380 Mon Sep 17 00:00:00 2001 From: Wedge Date: Sun, 22 May 2016 16:00:02 +0300 Subject: [PATCH] Bugfixes: filters in build lists, link to project --- .../build_lists/build_lists_controller.js.erb | 10 +++++++++- .../partials/_build_list_notification.json.jbuilder | 2 +- app/views/platforms/mass_builds/show_fail_reason.slim | 2 +- app/views/platforms/product_build_lists/show.html.slim | 2 +- .../platforms/repositories/_proj_ajax.json.jbuilder | 2 +- .../platforms/repositories/_project.json.jbuilder | 2 +- app/views/users/profile/show.json.jbuilder | 2 +- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/angularjs/build_lists/build_lists_controller.js.erb b/app/assets/javascripts/angularjs/build_lists/build_lists_controller.js.erb index eb6b8d0ce..000edd989 100644 --- a/app/assets/javascripts/angularjs/build_lists/build_lists_controller.js.erb +++ b/app/assets/javascripts/angularjs/build_lists/build_lists_controller.js.erb @@ -100,7 +100,15 @@ function($scope, BuildListsService, $location, $interval, $uibModal) { size: 'lg', resolve: { params: function() { - return $location.search(); + var ls = $location.search(); + var res = {}; + for(var i in ls) { + if(ls.hasOwnProperty(i)) { + res[i] = ls[i].toString(); + } + } + + return res; } } }); diff --git a/app/views/home/partials/_build_list_notification.json.jbuilder b/app/views/home/partials/_build_list_notification.json.jbuilder index d712c7dbc..c36d3eb6b 100644 --- a/app/views/home/partials/_build_list_notification.json.jbuilder +++ b/app/views/home/partials/_build_list_notification.json.jbuilder @@ -1,4 +1,4 @@ -json.project_link project_path(project_name_with_owner) +json.project_link project_build_lists_path(project_name_with_owner) json.build_list do json.id item.data[:build_list_id] json.link build_list_path(item.data[:build_list_id]) diff --git a/app/views/platforms/mass_builds/show_fail_reason.slim b/app/views/platforms/mass_builds/show_fail_reason.slim index 97141024c..497d0b52a 100644 --- a/app/views/platforms/mass_builds/show_fail_reason.slim +++ b/app/views/platforms/mass_builds/show_fail_reason.slim @@ -29,7 +29,7 @@ td = link_to item[0], build_list_path(item[0]) td - = link_to item[1], project_path(item[1]) + = link_to item[1], project_build_lists_path(item[1]) td = item[2] td diff --git a/app/views/platforms/product_build_lists/show.html.slim b/app/views/platforms/product_build_lists/show.html.slim index 96eb019ad..298e92a6d 100644 --- a/app/views/platforms/product_build_lists/show.html.slim +++ b/app/views/platforms/product_build_lists/show.html.slim @@ -42,7 +42,7 @@ td = t('activerecord.attributes.product_build_list.project') td - = link_to pbl.project.name_with_owner, project_path(pbl.project) + = link_to pbl.project.name_with_owner, project_build_lists_path(pbl.project) tr td diff --git a/app/views/platforms/repositories/_proj_ajax.json.jbuilder b/app/views/platforms/repositories/_proj_ajax.json.jbuilder index 0c0fe150c..1b332ec60 100644 --- a/app/views/platforms/repositories/_proj_ajax.json.jbuilder +++ b/app/views/platforms/repositories/_proj_ajax.json.jbuilder @@ -1,6 +1,6 @@ json.projects @projects do |project| json.visibility_class fa_visibility_icon(project) - json.path project_path(project.name_with_owner) + json.path project_build_lists_path(project.name_with_owner) json.name project.name_with_owner json.add_path url_for(controller: :repositories, action: :add_project, project_id: project.id) end diff --git a/app/views/platforms/repositories/_project.json.jbuilder b/app/views/platforms/repositories/_project.json.jbuilder index 39b3aa777..843fcb711 100644 --- a/app/views/platforms/repositories/_project.json.jbuilder +++ b/app/views/platforms/repositories/_project.json.jbuilder @@ -3,7 +3,7 @@ json.total_items @total_items json.projects @projects do |project| json.id project.id json.visibility_class fa_visibility_icon(project) - json.path project_path(project.name_with_owner) + json.path project_build_lists_path(project.name_with_owner) json.name project.name_with_owner if policy(@repository).remove_project? json.remove_path remove_project_platform_repository_path(@platform, @repository, project_id: project.id) diff --git a/app/views/users/profile/show.json.jbuilder b/app/views/users/profile/show.json.jbuilder index 909e93ca4..8b5113398 100644 --- a/app/views/users/profile/show.json.jbuilder +++ b/app/views/users/profile/show.json.jbuilder @@ -1,6 +1,6 @@ json.projects @projects do |project| json.(project, :name) - json.path project_path(project) + json.path project_build_lists_path(project) json.public project.public? json.updated_at project.updated_at json.updated_at_utc project.updated_at.strftime('%Y-%m-%d %H:%M:%S UTC')