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

Fix formating of way and relation redaction messages as well

Browse source
This commit is contained in:
Tom Hughes 2013-01-18 09:19:01 +00:00
parent bc31329da1
commit b0747c3c1e
3 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/views/browse/_relation_details.html.erb
View file

@ -1,8 +1,9 @@
<% if relation_details.redacted? %>
<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %></p>
<% else %>
<div class="browse_details" id="<%= relation_details.version %>">
<% if relation_details.redacted? %>
<div class='browse-section'>
<%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %><
</div>
<% else %>
<%= render :partial => "common_details", :object => relation_details %>
<% unless relation_details.relation_members.empty? %>
@ -18,6 +19,5 @@
<ul><%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %></ul>
</div>
<% end %>
</div>
<% end %>
</div>

13
app/views/browse/_way_details.html.erb
View file

@ -1,9 +1,9 @@
<% if way_details.redacted? %>
<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.way'), :redaction_link => link_to(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %></p>
<% else %>
<div class="browse_details" id="<%= way_details.version %>">
<% if way_details.redacted? %>
<div class='browse-section'>
<%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.way'), :redaction_link => link_to(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %>
</div>
<% else %>
<%= render :partial => "common_details", :object => way_details %>
<% unless way_details.way_nodes.empty? %>
@ -30,6 +30,5 @@
<%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %>
</ul>
<% end %>
</div>
<% end %>
</div>

29
test/functional/browse_controller_test.rb
View file

@ -88,9 +88,10 @@ class BrowseControllerTest < ActionController::TestCase
assert_template 'node_history'
# there are 2 revisions of the redacted node, but only one
# should be showing up here.
assert_select "body div[id=content] div[class=browse_details]", 1
assert_select "body div[id=content] div[class=browse_details][id=1]", 0
# should be showing details here.
assert_select "body div#content div.browse_details", 2
assert_select "body div#content div.browse_details[id=1] div.common", 0
assert_select "body div#content div.browse_details[id=2] div.common", 1
end
def test_redacted_way_history
@ -99,11 +100,12 @@ class BrowseControllerTest < ActionController::TestCase
assert_template 'way_history'
# there are 4 revisions of the redacted way, but only 2
# should be showing up here.
assert_select "body div[id=content] div[class=browse_details]", 2
# redacted revisions are 2 & 3
assert_select "body div[id=content] div[class=browse_details][id=2]", 0
assert_select "body div[id=content] div[class=browse_details][id=3]", 0
# should be showing details here.
assert_select "body div#content div.browse_details", 4
assert_select "body div#content div.browse_details[id=1] div.common", 1
assert_select "body div#content div.browse_details[id=2] div.common", 0
assert_select "body div#content div.browse_details[id=3] div.common", 0
assert_select "body div#content div.browse_details[id=4] div.common", 1
end
def test_redacted_relation_history
@ -112,11 +114,12 @@ class BrowseControllerTest < ActionController::TestCase
assert_template 'relation_history'
# there are 4 revisions of the redacted relation, but only 2
# should be showing up here.
assert_select "body div[id=content] div[class=browse_details]", 2
# redacted revisions are 2 & 3
assert_select "body div[id=content] div[class=browse_details][id=2]", 0
assert_select "body div[id=content] div[class=browse_details][id=3]", 0
# should be showing details here.
assert_select "body div#content div.browse_details", 4
assert_select "body div#content div.browse_details[id=1] div.common", 1
assert_select "body div#content div.browse_details[id=2] div.common", 0
assert_select "body div#content div.browse_details[id=3] div.common", 0
assert_select "body div#content div.browse_details[id=4] div.common", 1
end
# This is a convenience method for most of the above checks