nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed rspec build

Browse source
This commit is contained in:
maxwell 2010-12-16 10:15:16 -08:00
parent e7f1190705
commit 1451db6cd8
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/application_controller.rb
View file

@ -13,7 +13,7 @@ class ApplicationController < ActionController::Base
before_filter :set_locale before_filter :set_locale
def set_contacts_notifications_and_status def set_contacts_notifications_and_status
if current_user if user_signed_in?
@aspect = nil @aspect = nil
@aspects = current_user.aspects.fields(:name) @aspects = current_user.aspects.fields(:name)
@aspects_dropdown_array = @aspects.collect{|x| [x.to_s, x.id]} @aspects_dropdown_array = @aspects.collect{|x| [x.to_s, x.id]}
@ -36,13 +36,13 @@ class ApplicationController < ActionController::Base
end end
def set_invites def set_invites
if current_user if user_signed_in?
@invites = current_user.invites @invites = current_user.invites
end end
end end
def set_locale def set_locale
if current_user if user_signed_in?
I18n.locale = current_user.language I18n.locale = current_user.language
else else
I18n.locale = request.compatible_language_from AVAILABLE_LANGUAGE_CODES I18n.locale = request.compatible_language_from AVAILABLE_LANGUAGE_CODES

2
app/controllers/posts_controller.rb
View file

@ -3,7 +3,7 @@
# the COPYRIGHT file. # the COPYRIGHT file.
class PostsController < ApplicationController class PostsController < ApplicationController
skip_before_filter :set_contacts_and_status skip_before_filter :set_contacts_notifications_and_status
skip_before_filter :count_requests skip_before_filter :count_requests
skip_before_filter :set_invites skip_before_filter :set_invites
skip_before_filter :set_locale skip_before_filter :set_locale

2
app/controllers/publics_controller.rb
View file

@ -6,7 +6,7 @@ class PublicsController < ApplicationController
require File.join(Rails.root, '/lib/diaspora/parser') require File.join(Rails.root, '/lib/diaspora/parser')
include Diaspora::Parser include Diaspora::Parser
skip_before_filter :set_contacts_and_status, :except => [:create, :update] skip_before_filter :set_contacts_notifications_and_status, :except => [:create, :update]
skip_before_filter :count_requests skip_before_filter :count_requests
skip_before_filter :set_invites skip_before_filter :set_invites
skip_before_filter :set_locale skip_before_filter :set_locale

1
lib/diaspora/webhooks.rb
View file

@ -15,6 +15,5 @@ module Diaspora
def x(input) def x(input)
input.to_s.to_xs input.to_s.to_xs
end end
end end
end end