Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-18 15:15:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Get all non-cucumber tests passing

Browse source
This commit is contained in:
Reinier Balt 2012-04-12 12:47:25 +02:00
parent bb8b5a4c72
commit 12d8915eda
7 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -11,7 +11,7 @@ class ApplicationController < ActionController::Base
helper :application
include LoginSystem
helper_method :current_user, :prefs, :format_date, :markdown
helper_method :current_user, :prefs, :format_date
layout proc{ |controller| controller.mobile? ? "mobile" : "standard" }
exempt_from_layout /\.js\.erb$/

2
app/controllers/todos_controller.rb
View file

@ -1242,7 +1242,7 @@ class TodosController < ApplicationController
def todo_feed_content
# TODO: move view stuff into view, also the includes at the top
lambda do |i|
item_notes = sanitize(markdown( i.notes )) if i.notes?
item_notes = i.rendered_notes if i.notes?
due = "<div>#{t('todos.feeds.due', :date => format_date(i.due))}</div>\n" if i.due?
done = "<div>#{t('todos.feeds.completed', :date => format_date(i.completed_at))}</div>\n" if i.completed?
context_link = "<a href=\"#{ context_url(i.context) }\">#{ i.context.name }</a>"