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

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	app/views/projects/_project_settings.html.erb
	app/views/todos/_todo.html.erb
This commit is contained in:
Reinier Balt 2013-09-13 16:52:06 +02:00
commit 9c86396ef0
36 changed files with 94 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/projects_controller.rb
View file

@ -38,11 +38,7 @@ class ProjectsController < ApplicationController
cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']}
end
format.xml { render :xml => @projects.to_xml( :except => :user_id ) }
format.rss do
@feed_title = I18n.t('models.project.feed_title')
@feed_description = I18n.t('models.project.feed_description', :username => current_user.display_name)
end
format.atom do
format.any(:rss, :atom) do
@feed_title = I18n.t('models.project.feed_title')
@feed_description = I18n.t('models.project.feed_description', :username => current_user.display_name)
end
@ -339,7 +335,7 @@ class ProjectsController < ApplicationController
default_context_name = p['default_context_name']
p.delete('default_context_name')
unless default_context_name.blank?
if default_context_name.present?
default_context = current_user.contexts.where(:name => default_context_name).first_or_create
p['default_context_id'] = default_context.id
end