Extract the no results box to a helper and partial

pull/3665/head
Peter Lehwess 9 years ago
parent 2a490cab6c
commit 671d7e677d
  1. 63
      app/helpers/no_results_helper.rb
  2. 39
      app/views/common/_no_results.html.erb
  3. 13
      app/views/members/index.html.erb
  4. 7
      app/views/news/index.html.erb
  5. 13
      app/views/reportings/index.html.erb
  6. 3
      app/views/wiki/index.html.erb
  7. 63
      spec/helpers/no_results_helper_spec.rb

@ -0,0 +1,63 @@
#-- encoding: UTF-8
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
# Copyright (C) 2006-2013 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# See doc/COPYRIGHT.rdoc for more details.
#++
module NoResultsHelper
# Helper to render the /common/no_results partial custamizable content.
# Example usage:
# no_results_box action_url: new_project_version_path(@project),
# display_action: authorize_for('messages', 'new')
#
# All arguments are optional.
# - 'action_url' The url for the link in the content.
# - 'display_action' Whether or not the link should be displayed.
# - 'custom_title' custom text for the title.
# - 'custom_action_text' custom text for the title.
#
# Calling this on its on without any arguments creates the box in its simplest
# form with only the title. Providing an action_url and display_action: true
# Displays the box with the title and link to the passed in url.
# The title and action_text are found using the locales key lookup unless
# custom_title and custom_action_text are provided.
def no_results_box(action_url: nil,
display_action: false,
custom_title: nil,
custom_action_text: nil)
title = custom_title || t('.no_results_title_text')
action_text = custom_action_text || t('.no_results_content_text')
render partial: '/common/no_results',
locals: {
title_text: title,
action_text: display_action ? action_text : '',
action_url: action_url || ''
}
end
end

@ -0,0 +1,39 @@
<%#-- copyright
OpenProject is a project management system.
Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 3.
OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
Copyright (C) 2006-2013 Jean-Philippe Lang
Copyright (C) 2010-2013 the ChiliProject Team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<div class="generic-table--no-results-container">
<h2 class="generic-table--no-results-title">
<i class="icon-info"></i>
<%= title_text %>
</h2>
<% if action_text.present? && action_url.present? %>
<div class="generic-table--no-results-description">
<%= link_to action_text, action_url %>
</div>
<% end %>
</div>

@ -143,16 +143,7 @@ See doc/COPYRIGHT.rdoc for more details.
</div>
<%= pagination_links_full @members, @pagination_url_options || {} %>
<% else %>
<div class="generic-table--container">
<div class="generic-table--no-results-container">
<h2 class="generic-table--no-results-title">
<i class="icon-info"></i>
<%= l(:label_nothing_display) %>
</h2>
<div class="generic-table--no-results-description">
<p class="nodata"><%= l(:label_no_data) %></p>
</div>
</div>
</div>
<%= no_results_box(action_url: new_project_member_path,
display_action: authorize_for(:members, :new)) %>
<% end %>
</div>

@ -38,7 +38,12 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
<% end %>
<% if @newss.empty? %>
<p class="nodata"><%= l(:label_no_data) %></p>
<% if User.current.allowed_to?(:manage_news, @project) %>
<%= no_results_box(action_url: new_project_news_path(@project),
display_action: true) %>
<% else %>
<%= no_results_box %>
<% end %>
<% else %>
<% @newss.each do |news| %>
<h3><%= avatar(news.author) %><%= link_to_project(news.project) + ': ' unless news.project == @project %>

@ -40,17 +40,8 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
<% if @reportings.blank? %>
<div class="generic-table--container">
<div class="generic-table--no-results-container">
<h2 class="generic-table--no-results-title">
<i class="icon-info"></i>
<%= l(:label_nothing_display) %>
</h2>
<div class="generic-table--no-results-description">
<p class="nodata"><%= l(:label_no_data) %></p>
</div>
</div>
</div>
<%= no_results_box(action_url: new_project_reporting_path(@project),
display_action: authorize_for(:reportings, :new)) %>
<% else %>
<div class="generic-table--container">
<div class="generic-table--results-container">

@ -51,6 +51,9 @@ See doc/COPYRIGHT.rdoc for more details.
<%= f.link_to 'Atom', :url => {:controller => '/activities', :action => 'index', :show_wiki_edits => 1, :key => User.current.rss_key} %>
<%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
<% end %>
<% else %>
<%= no_results_box(action_url: wiki_new_path(@project),
display_action: authorize_for('wiki', 'new')) %>
<% end %>
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom, :controller => '/activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>

@ -0,0 +1,63 @@
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
# Copyright (C) 2006-2013 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# See doc/COPYRIGHT.rdoc for more details.
#++
require 'spec_helper'
describe NoResultsHelper do
before do
allow(helper).to receive(:t).with('.no_results_title_text', cascade: true) { "Nothing here!" }
allow(helper).to receive(:t).with('.no_results_content_text') { "Add some foo" }
end
describe '#no_results_box' do
it "contains the just the title" do
expect(helper.no_results_box).to have_content 'Nothing here!'
expect(helper.no_results_box).to_not have_link 'Add some foo'
end
it "contains the title and content link" do
no_results_box = helper.no_results_box(action_url: root_path,
display_action: true)
expect(no_results_box).to have_content 'Nothing here!'
expect(no_results_box).to have_link 'Add some foo', href: '/'
end
it 'contains title and content_link with custom text' do
no_results_box = helper.no_results_box(action_url: root_path,
display_action: true,
custom_title: 'This is a different title about foo',
custom_action_text: 'Link to nowhere')
expect(no_results_box).to have_content 'This is a different title about foo'
expect(no_results_box).to have_link 'Link to nowhere', href: '/'
end
end
end
Loading…
Cancel
Save