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

kill references to ServiceUser

Browse source
This commit is contained in:
Dennis Collinson 2012-05-14 18:47:14 -07:00
parent 68439ebab3
commit 927b78b79d
2 changed files with 3 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/models/invitation.rb
View file

@ -2,6 +2,7 @@
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
#TODO: kill me
class Invitation < ActiveRecord::Base
belongs_to :sender, :class_name => 'User'
@ -99,11 +100,7 @@ class Invitation < ActiveRecord::Base
when 'email'
self.identifier
when'facebook'
if su = ServiceUser.where(:uid => self.identifier).first
su.name
else
I18n.t('invitations.a_facebook_user')
end
I18n.t('invitations.a_facebook_user')
end
end

27
config/initializers/rails_admin.rb
View file

@ -40,7 +40,7 @@ RailsAdmin.config do |config|
# ==> Included models
# Add all excluded models here:
config.excluded_models = [ActivityStreams::Photo, AspectMembership, AspectVisibility, ShareVisibility, ConversationVisibility, NotificationActor, Notifications::AlsoCommented, Notifications::CommentOnPost, Notifications::Liked, Notifications::Mentioned, Notifications::PrivateMessage, Notifications::RequestAccepted, Notifications::Reshared, Notifications::StartedSharing, Reshare, ServiceUser, Services::Facebook, Services::Tumblr, Services::Twitter, UserPreference]
config.excluded_models = [ActivityStreams::Photo, AspectMembership, AspectVisibility, ShareVisibility, ConversationVisibility, NotificationActor, Notifications::AlsoCommented, Notifications::CommentOnPost, Notifications::Liked, Notifications::Mentioned, Notifications::PrivateMessage, Notifications::RequestAccepted, Notifications::Reshared, Notifications::StartedSharing, Reshare, Services::Facebook, Services::Tumblr, Services::Twitter, UserPreference]
# Add models here if you want to go 'whitelist mode':
# config.included_models = [AccountDeletion, ActivityStreams::Photo, ActsAsTaggableOn::Tag, Aspect, AspectMembership, AspectVisibility, Block, Comment, Contact, Conversation, ConversationVisibility, Invitation, InvitationCode, Like, Mention, Message, Notification, NotificationActor, Notifications::AlsoCommented, Notifications::CommentOnPost, Notifications::Liked, Notifications::Mentioned, Notifications::PrivateMessage, Notifications::RequestAccepted, Notifications::Reshared, Notifications::StartedSharing, OEmbedCache, Participation, Person, Photo, Pod, Post, Profile, Reshare, Service, ServiceUser, Services::Facebook, Services::Tumblr, Services::Twitter, ShareVisibility, StatusMessage, TagFollowing, User, UserPreference]
@ -882,31 +882,6 @@ RailsAdmin.config do |config|
# create do; end
# update do; end
# end
# config.model ServiceUser do
# # Found associations:
# configure :service, :belongs_to_association
# configure :person, :belongs_to_association
# configure :contact, :belongs_to_association
# configure :invitation, :belongs_to_association # # Found columns:
# configure :id, :integer
# configure :uid, :string
# configure :name, :string
# configure :photo_url, :string
# configure :service_id, :integer # Hidden
# configure :person_id, :integer # Hidden
# configure :contact_id, :integer # Hidden
# configure :request_id, :integer
# configure :invitation_id, :integer # Hidden
# configure :created_at, :datetime
# configure :updated_at, :datetime
# configure :username, :string # # Sections:
# list do; end
# export do; end
# show do; end
# edit do; end
# create do; end
# update do; end
# end
# config.model Services::Facebook do
# # Found associations:
# configure :user, :belongs_to_association