Skip to content
This repository has been archived by the owner on May 12, 2018. It is now read-only.

Commit

Permalink
Cleanup error messages
Browse files Browse the repository at this point in the history
  • Loading branch information
dzaporozhets committed Jan 13, 2015
1 parent a8f156d commit f2ccfd9
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 21 deletions.
9 changes: 3 additions & 6 deletions app/helpers/projects_helper.rb
Expand Up @@ -23,15 +23,12 @@ def html_badge_code(project, ref)
"<a href='#{project_url(project, ref: ref)}'><img src='#{url}' /></a>"
end

def runners_for_project(project)
project.runners.map { |r| "#" + r.id.to_s }.join(", ")
end

def project_uses_specific_runner?(project)
project.runners.any?
end

def no_shared_runners_for_project?(project)
Runner.count.nonzero? && project.runners.blank? && Runner.shared.blank?
def no_runners_for_project?(project)
project.runners.blank? &&
Runner.shared.blank?
end
end
6 changes: 2 additions & 4 deletions app/views/projects/_info.html.haml
@@ -1,4 +1,2 @@
- if no_shared_runners_for_project?(@project)
= render 'no_shared_runners'
- if project_uses_specific_runner?(@project)
= render 'specific_runner'
- if no_runners_for_project?(@project)
= render 'no_runners'
8 changes: 8 additions & 0 deletions app/views/projects/_no_runners.html.haml
@@ -0,0 +1,8 @@
.alert.alert-danger
%p
There are NO runners to build this project.
%br
You can add Specific runner for this project on Runners page

- if current_user.is_admin
or add Shared runner for whole application in admin are.
5 changes: 0 additions & 5 deletions app/views/projects/_no_shared_runners.html.haml

This file was deleted.

6 changes: 0 additions & 6 deletions app/views/projects/_specific_runner.html.haml

This file was deleted.

0 comments on commit f2ccfd9

Please sign in to comment.