diff options
| author | lizconlan <liz@mysociety.org> | 2014-07-22 12:35:40 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-09-22 12:39:02 +0100 |
| commit | cb2dfa0c464e72c4d0eb00e5381e9d24c57d63e2 (patch) | |
| tree | 9134a5cd15ff3fcd8e2d9a5b544cbc8c00c4718d | |
| parent | 74431c14502314001120883b5ee67298afc3ccf3 (diff) | |
List categories without headings on the admin screen
5 files changed, 51 insertions, 32 deletions
diff --git a/app/controllers/admin_public_body_category_controller.rb b/app/controllers/admin_public_body_category_controller.rb index c4f342ddb..0fece725e 100644 --- a/app/controllers/admin_public_body_category_controller.rb +++ b/app/controllers/admin_public_body_category_controller.rb @@ -2,6 +2,7 @@ class AdminPublicBodyCategoryController < AdminController def index @locale = self.locale_from_params @category_headings = PublicBodyHeading.all + @without_heading = PublicBodyCategory.without_headings end def new diff --git a/app/models/public_body_category.rb b/app/models/public_body_category.rb index c0d8e07c6..2e2c8d74e 100644 --- a/app/models/public_body_category.rb +++ b/app/models/public_body_category.rb @@ -40,6 +40,15 @@ class PublicBodyCategory < ActiveRecord::Base categories end + def self.without_headings + sql = %Q| SELECT * FROM public_body_categories pbc + WHERE pbc.id NOT IN ( + SELECT public_body_category_id AS id + FROM public_body_categories_public_body_headings + ) | + PublicBodyCategory.find_by_sql(sql) + end + # Called from the data files themselves def self.add(locale, categories) @heading = nil diff --git a/app/views/admin_public_body_category/_one.html.erb b/app/views/admin_public_body_category/_one.html.erb new file mode 100644 index 000000000..c2f667b9f --- /dev/null +++ b/app/views/admin_public_body_category/_one.html.erb @@ -0,0 +1,31 @@ + <div class="accordion-group"> + <div class="accordion-heading accordion-toggle row"> + <span class="item-title span6"> + <a href="#category_<%=category.id%>" data-toggle="collapse" data-parent="requests"><%= chevron_right %></a> + + <%= link_to(category.title, admin_category_edit_path(category), :title => "view full details")%> + </span> + <span class="item-metadata span6"> + <span class="label label-info tag"> + <%= category.category_tag %> + </span> + </span> + </div> + <div id="category_<%= category.id %>" class="item-detail accordion-body collapse row"> + <div> + <span class="span6"> + <b>name</b> + </span> + <span class="span6"> + <%= h category.title %> + </span> + </div> + <div> + <span class="span6"> + <b>description</b> + </span> + <span class="span6"> + <%= h category.description %> + </span> + </div> + </div>
\ No newline at end of file diff --git a/app/views/admin_public_body_category/_one_list.html.erb b/app/views/admin_public_body_category/_one_list.html.erb index 7303ff803..a8c349faa 100644 --- a/app/views/admin_public_body_category/_one_list.html.erb +++ b/app/views/admin_public_body_category/_one_list.html.erb @@ -5,39 +5,8 @@ </h3> <div> <% for category in heading.public_body_categories %> - <div class="accordion-group"> - <div class="accordion-heading accordion-toggle row"> - <span class="item-title span6"> - <a href="#category_<%=category.id%>" data-toggle="collapse" data-parent="requests"><%= chevron_right %></a> - - <%= link_to(category.title, admin_category_edit_path(category), :title => "view full details")%> - </span> - <span class="item-metadata span6"> - <span class="label label-info tag"> - <%= category.category_tag %> - </span> - </span> - </div> - <div id="category_<%=category.id%>" class="item-detail accordion-body collapse row"> - <div> - <span class="span6"> - <b>name</b> - </span> - <span class="span6"> - <%= h category.title %> - </span> - </div> - <div> - <span class="span6"> - <b>description</b> - </span> - <span class="span6"> - <%= h category.description %> - </span> - </div> - </div> + <%= render :partial => 'one', :locals => { :category => category } %> <% end %> - </div> </div> <% end %> </div>
\ No newline at end of file diff --git a/app/views/admin_public_body_category/index.html.erb b/app/views/admin_public_body_category/index.html.erb index ca3a4b0ff..8f152cf58 100644 --- a/app/views/admin_public_body_category/index.html.erb +++ b/app/views/admin_public_body_category/index.html.erb @@ -14,3 +14,12 @@ <h2>All categories</h2> <%= render :partial => 'one_list', :locals => { :category_headings => @category_headings, :table_name => 'exact' } %> + +<% if @without_heading.count > 0 %> + + <h3>No heading</h3> + + <% @without_heading.each do |category| %> + <%= render :partial => 'one', :locals => { :category => category } %> + <% end %> +<% end %> |