cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorder changeset detail lists

Browse source 
Nodes, ways, relations -> Ways, relations, nodes
This commit is contained in:
Aaron Lidman 2013-11-18 16:24:25 -08:00
parent df32eee833
commit f45437f836
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/browse_controller.rb
View file

@ -57,7 +57,7 @@ class BrowseController < ApplicationController
def changeset
@type = "changeset"
@changeset = Changeset.find(params[:id])
@node_pages, @nodes = paginate(:old_nodes, :conditions => {:changeset_id => @changeset.id}, :per_page => 10, :parameter => 'node_page')
@node_pages, @nodes = paginate(:old_nodes, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'node_page')
@way_pages, @ways = paginate(:old_ways, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'way_page')
@relation_pages, @relations = paginate(:old_relations, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'relation_page')
rescue ActiveRecord::RecordNotFound

24
app/views/browse/changeset.html.erb
View file

@ -11,18 +11,6 @@
<%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>
<% unless @nodes.empty? %>
<h4>
<%= type_and_paginated_count('node', @node_pages) %>
<%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
</h4>
<ul>
<% @nodes.each do |node| %>
<li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
<% end %>
</ul>
<% end %>
<% unless @ways.empty? %>
<h4>
<%= type_and_paginated_count('way', @way_pages) %>
@ -46,6 +34,18 @@
<% end %>
</ul>
<% end %>
<% unless @nodes.empty? %>
<h4>
<%= type_and_paginated_count('node', @node_pages) %>
<%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
</h4>
<ul>
<% @nodes.each do |node| %>
<li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
<% end %>
</ul>
<% end %>
</div>
<div class='secondary-actions'>