aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorMarc Florisson2012-05-16 22:54:23 +0200
committerMarc Florisson2012-05-16 22:54:23 +0200
commit9485e4ddc7afc5c481b066dfc8bb315f296d0023 (patch)
tree72700680784e3acb49a0450098ea73b3d6ef461b /app
parent7bcb93aff46042a8fd229f6c78b3e8bbb4431f5c (diff)
downloadchouette-core-9485e4ddc7afc5c481b066dfc8bb315f296d0023.tar.bz2
add some spec on route and stop_points
Diffstat (limited to 'app')
-rw-r--r--app/controllers/stop_points_controller.rb4
-rw-r--r--app/views/routes/show.html.erb2
-rw-r--r--app/views/stop_points/new.html.erb5
3 files changed, 5 insertions, 6 deletions
diff --git a/app/controllers/stop_points_controller.rb b/app/controllers/stop_points_controller.rb
index a6833eb06..22b23cff5 100644
--- a/app/controllers/stop_points_controller.rb
+++ b/app/controllers/stop_points_controller.rb
@@ -23,9 +23,7 @@ class StopPointsController < ChouetteController
else
flash[:alert] = t("stop_points.reorder_failure")
end
- respond_to do |format|
- format.html { redirect_to :action => :index }
- end
+ redirect_to :action => :index
end
end
diff --git a/app/views/routes/show.html.erb b/app/views/routes/show.html.erb
index b98bab92a..f248ba595 100644
--- a/app/views/routes/show.html.erb
+++ b/app/views/routes/show.html.erb
@@ -83,7 +83,7 @@
<li><%= link_to t('routes.actions.edit'), edit_referential_line_route_path(@referential, @line, @route), :class => "edit" %></li>
<li><%= link_to t('routes.actions.destroy'), referential_line_route_path(@referential, @line, @route), :method => :delete, :confirm => t('routes.actions.destroy_confirm'), :class => "remove" %></li>
<li>
- <%= link_to t('stop_points.actions.index'), referential_line_route_stop_points_path(@referential, @line, @route), :class => "edit" %>
+ <%= link_to t('stop_points.actions.sort'), referential_line_route_stop_points_path(@referential, @line, @route), :class => "edit" %>
</li>
</ul>
<% end %>
diff --git a/app/views/stop_points/new.html.erb b/app/views/stop_points/new.html.erb
index a69840bf6..3b2e86c41 100644
--- a/app/views/stop_points/new.html.erb
+++ b/app/views/stop_points/new.html.erb
@@ -7,8 +7,9 @@
<% end %>
<%= form.buttons do %>
- <%= form.commit_button %>
- ou <%= link_to "revenir", referential_line_route_stop_points_path(@referential, @line, @route) %>
+ <%= form.commit_button true %>
+ <li><%= t('or') %></li>
+ <li><%= link_to t('cancel'), :back %></li>
<% end %>
</div>
<% end %>