From 18dfe4dbfb026dd1f8499033176fd5945ad71422 Mon Sep 17 00:00:00 2001 From: Eric Allen Date: Mon, 7 Dec 2009 23:16:21 -0500 Subject: [PATCH] Missed some formatted_ helpers not covered by tests Selenium tests now passing completely --- app/controllers/login_controller.rb | 2 +- app/controllers/todos_controller.rb | 6 +++--- app/helpers/application_helper.rb | 2 +- app/views/contexts/_mobile_context_listing.rhtml | 2 +- app/views/login/login_mobile.html.erb | 4 ++-- app/views/notes/_mobile_notes.rhtml | 2 +- app/views/notes/_mobile_notes_summary.rhtml | 2 +- app/views/projects/_mobile_project_listing.rhtml | 4 ++-- app/views/todos/show.m.erb | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb index 360a8455..e33046a9 100644 --- a/app/controllers/login_controller.rb +++ b/app/controllers/login_controller.rb @@ -80,7 +80,7 @@ class LoginController < ApplicationController def redirect_to_login respond_to do |format| format.html { redirect_to login_path } - format.m { redirect_to formatted_login_path(:format => 'm') } + format.m { redirect_to login_path(:format => 'm') } end end diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 3620fe25..65a30e91 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -349,7 +349,7 @@ class TodosController < ApplicationController cookies[:mobile_url] = {:value => nil, :secure => SITE_CONFIG['secure_cookies']} redirect_to old_path else - redirect_to formatted_todos_path(:m) + redirect_to todos_path(:format => 'm') end else render :action => "edit", :format => :m @@ -461,12 +461,12 @@ class TodosController < ApplicationController def filter_to_context context = current_user.contexts.find(params['context']['id']) - redirect_to formatted_context_todos_path(context, :m) + redirect_to context_todos_path(context, :format => 'm') end def filter_to_project project = current_user.projects.find(params['project']['id']) - redirect_to formatted_project_todos_path(project, :m) + redirect_to project_todos_path(project, :format => 'm') end # /todos/tag/[tag_name] shows all the actions tagged with tag_name diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 26bff1b3..02786600 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -112,7 +112,7 @@ module ApplicationHelper end def link_to_project_mobile(project, accesskey, descriptor = sanitize(project.name)) - link_to( descriptor, formatted_project_path(project, :m), {:title => "View project: #{project.name}", :accesskey => accesskey} ) + link_to( descriptor, project_path(project, :format => 'm'), {:title => "View project: #{project.name}", :accesskey => accesskey} ) end def item_link_to_context(item) diff --git a/app/views/contexts/_mobile_context_listing.rhtml b/app/views/contexts/_mobile_context_listing.rhtml index 4f770186..c2360ce7 100644 --- a/app/views/contexts/_mobile_context_listing.rhtml +++ b/app/views/contexts/_mobile_context_listing.rhtml @@ -1,2 +1,2 @@ <% context = mobile_context_listing -%> -
<%= link_to context.name, formatted_context_path(context, :m) %><%= " (" + count_undone_todos_phrase(context,"actions") + ")" %>
\ No newline at end of file +
<%= link_to context.name, context_path(context, :format => 'm') %><%= " (" + count_undone_todos_phrase(context,"actions") + ")" %>
diff --git a/app/views/login/login_mobile.html.erb b/app/views/login/login_mobile.html.erb index a2b7cd94..c0c248a1 100644 --- a/app/views/login/login_mobile.html.erb +++ b/app/views/login/login_mobile.html.erb @@ -11,7 +11,7 @@ <% if show_database_form %>
- <% form_tag formatted_login_path(:format => 'm') do %> + <% form_tag login_path(:format => 'm') do %> @@ -39,7 +39,7 @@

...or login with an Open ID:

- <% form_tag formatted_login_path(:format => 'm') do %> + <% form_tag login_path(:format => 'm') do %>
diff --git a/app/views/notes/_mobile_notes.rhtml b/app/views/notes/_mobile_notes.rhtml index d5f4d7ab..8c257da5 100644 --- a/app/views/notes/_mobile_notes.rhtml +++ b/app/views/notes/_mobile_notes.rhtml @@ -4,7 +4,7 @@

- <%= link_to("In: " + note.project.name, formatted_project_path(note.project, :m)) %> + <%= link_to("In: " + note.project.name, project_path(note.project, :format => 'm')) %> Created: <%= format_date(note.created_at) %> <% if note.updated_at? -%>  | Modified: <%= format_date(note.updated_at) %> diff --git a/app/views/notes/_mobile_notes_summary.rhtml b/app/views/notes/_mobile_notes_summary.rhtml index a2e117b6..4a1f7657 100644 --- a/app/views/notes/_mobile_notes_summary.rhtml +++ b/app/views/notes/_mobile_notes_summary.rhtml @@ -1,3 +1,3 @@ <% note = mobile_notes_summary -%> -
<%= link_to( truncated_note(note), formatted_note_path(note, :m)) %>
+
<%= link_to( truncated_note(note), note_path(note, :format => 'm')) %>
<% note = nil -%> diff --git a/app/views/projects/_mobile_project_listing.rhtml b/app/views/projects/_mobile_project_listing.rhtml index 167854bb..440536bb 100644 --- a/app/views/projects/_mobile_project_listing.rhtml +++ b/app/views/projects/_mobile_project_listing.rhtml @@ -1,4 +1,4 @@ <% project = mobile_project_listing -%>
<%= - link_to(project.name, formatted_project_path(project)) + - " (" + count_undone_todos_and_notes_phrase(project,"actions") + ")" %>
\ No newline at end of file + link_to(project.name, project_path(project, :format => 'm')) + + " (" + count_undone_todos_and_notes_phrase(project,"actions") + ")" %>
diff --git a/app/views/todos/show.m.erb b/app/views/todos/show.m.erb index 004b94f6..e8105669 100644 --- a/app/views/todos/show.m.erb +++ b/app/views/todos/show.m.erb @@ -1,4 +1,4 @@ -<% form_tag formatted_todo_path(@todo, :m), :method => :put do %> +<% form_tag todo_path(@todo, :format => 'm'), :method => :put do %> <%= render :partial => 'edit_mobile', :locals => { :parent_container_type => "show_mobile" } %>

<% end -%>