@@ -3,7 +3,7 | |||||
3 | <% if @import.saved_items.count > 0 %> |
|
3 | <% if @import.saved_items.count > 0 %> | |
4 | <p><%= l(:notice_import_finished, :count => @import.saved_items.count) %></p> |
|
4 | <p><%= l(:notice_import_finished, :count => @import.saved_items.count) %></p> | |
5 |
|
5 | |||
6 | <ul> |
|
6 | <ul id="saved-items"> | |
7 | <% @import.saved_objects.each do |issue| %> |
|
7 | <% @import.saved_objects.each do |issue| %> | |
8 | <li><%= link_to_issue issue %></li> |
|
8 | <li><%= link_to_issue issue %></li> | |
9 | <% end %> |
|
9 | <% end %> | |
@@ -14,16 +14,20 | |||||
14 | <p><%= l(:notice_import_finished_with_errors, :count => @import.unsaved_items.count, :total => @import.total_items) %></p> |
|
14 | <p><%= l(:notice_import_finished_with_errors, :count => @import.unsaved_items.count, :total => @import.total_items) %></p> | |
15 |
|
15 | |||
16 | <table id="unsaved-items" class="list"> |
|
16 | <table id="unsaved-items" class="list"> | |
|
17 | <thead> | |||
17 | <tr> |
|
18 | <tr> | |
18 | <th>Position</th> |
|
19 | <th>Position</th> | |
19 | <th>Message</th> |
|
20 | <th>Message</th> | |
20 | </tr> |
|
21 | </tr> | |
|
22 | </thead> | |||
|
23 | <tbody> | |||
21 | <% @import.unsaved_items.each do |item| %> |
|
24 | <% @import.unsaved_items.each do |item| %> | |
22 | <tr> |
|
25 | <tr> | |
23 | <td><%= item.position %></td> |
|
26 | <td><%= item.position %></td> | |
24 | <td><%= simple_format_without_paragraph item.message %></td> |
|
27 | <td><%= simple_format_without_paragraph item.message %></td> | |
25 | </tr> |
|
28 | </tr> | |
26 | <% end %> |
|
29 | <% end %> | |
|
30 | </tbody> | |||
27 | </table> |
|
31 | </table> | |
28 | <% end %> |
|
32 | <% end %> | |
29 |
|
33 |
@@ -184,6 +184,8 class ImportsControllerTest < ActionController::TestCase | |||||
184 | get :show, :id => import.to_param |
|
184 | get :show, :id => import.to_param | |
185 | assert_response :success |
|
185 | assert_response :success | |
186 | assert_template 'show' |
|
186 | assert_template 'show' | |
|
187 | assert_select 'ul#saved-items' | |||
|
188 | assert_select 'ul#saved-items li', import.saved_items.count | |||
187 | assert_select 'table#unsaved-items', 0 |
|
189 | assert_select 'table#unsaved-items', 0 | |
188 | end |
|
190 | end | |
189 |
|
191 | |||
@@ -197,5 +199,6 class ImportsControllerTest < ActionController::TestCase | |||||
197 | assert_response :success |
|
199 | assert_response :success | |
198 | assert_template 'show' |
|
200 | assert_template 'show' | |
199 | assert_select 'table#unsaved-items' |
|
201 | assert_select 'table#unsaved-items' | |
|
202 | assert_select 'table#unsaved-items tbody tr', import.unsaved_items.count | |||
200 | end |
|
203 | end | |
201 | end |
|
204 | end |
General Comments 0
You need to be logged in to leave comments.
Login now