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

fixed wrong indenting and broken messages tab for polls

Browse source
This commit is contained in:
Jannik Streek 2014-03-21 19:09:24 +01:00
parent 8a4f833d1d
commit c02414c36d
5 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/publisher.css.scss
View file

@ -59,7 +59,6 @@
resize: none; resize: none;
height: 50px; height: 50px;
} }
}
&.active textarea { &.active textarea {
min-height: 70px; min-height: 70px;
@ -79,7 +78,6 @@
line-height: 20px !important; line-height: 20px !important;
width: 100% !important; width: 100% !important;
} }
}
&.with_attachments .row-fluid#photodropzone_container { &.with_attachments .row-fluid#photodropzone_container {
border-top: 1px dashed $border-grey; border-top: 1px dashed $border-grey;

2
app/models/poll.rb
View file

@ -15,7 +15,7 @@ class Poll < ActiveRecord::Base
validate :enough_poll_answers validate :enough_poll_answers
def enough_poll_answers def enough_poll_answers
errors.add(:poll_answers, I18n.t("activerecord.errors.models.poll.attributes.poll_answers.not_enough_poll_answers")) if poll_answers.size < 2 errors.add(:poll_answers, I18n.t("activerecord.errors.models.poll.attributes.poll_answers.not_enough_poll_answers")) if poll_answers.size < 2
end end
end end

4
app/models/poll_answer.rb
View file

@ -9,8 +9,8 @@ class PollAnswer < ActiveRecord::Base
xml_attr :answer xml_attr :answer
def update_vote_counter def update_vote_counter
self.vote_count = self.vote_count + 1 self.vote_count = self.vote_count + 1
self.save! self.save!
end end
end end

2
app/models/poll_participation.rb
View file

@ -52,7 +52,7 @@ class PollParticipation < ActiveRecord::Base
existing = PollParticipation.where(author_id: self.author.id, poll_id: self.poll.id) existing = PollParticipation.where(author_id: self.author.id, poll_id: self.poll.id)
if existing.first != self and existing.count != 0 if existing.first != self and existing.count != 0
self.errors.add(:poll, I18n.t("errors.models.poll_participations.attributes.poll.already_participated")) self.errors.add(:poll, I18n.t("activerecord.errors.models.poll_participations.attributes.poll.already_participated"))
end end
end end

20
spec/models/poll_participation_spec.rb
View file

@ -29,7 +29,7 @@ describe PollParticipation do
end end
describe 'xml' do describe 'xml' do
before do before do
@poll_participant = FactoryGirl.create(:user) @poll_participant = FactoryGirl.create(:user)
@poll_participant_aspect = @poll_participant.aspects.create(:name => "bruisers") @poll_participant_aspect = @poll_participant.aspects.create(:name => "bruisers")
@ -75,22 +75,22 @@ describe PollParticipation do
end end
describe 'it is relayable' do describe 'it is relayable' do
before do before do
@local_luke, @local_leia, @remote_raphael = set_up_friends @local_luke, @local_leia, @remote_raphael = set_up_friends
@remote_parent = FactoryGirl.build(:status_message_with_poll, :author => @remote_raphael) @remote_parent = FactoryGirl.build(:status_message_with_poll, :author => @remote_raphael)
@local_parent = @local_luke.post :status_message, :text => "hi", :to => @local_luke.aspects.first @local_parent = @local_luke.post :status_message, :text => "hi", :to => @local_luke.aspects.first
@poll2 = Poll.new(:question => 'Who is now in charge?') @poll2 = Poll.new(:question => 'Who is now in charge?')
@poll2.poll_answers.build(:answer => "a") @poll2.poll_answers.build(:answer => "a")
@poll2.poll_answers.build(:answer => "b") @poll2.poll_answers.build(:answer => "b")
@local_parent.poll = @poll2 @local_parent.poll = @poll2
@object_by_parent_author = @local_luke.participate_in_poll!(@local_parent, @poll2.poll_answers.first) @object_by_parent_author = @local_luke.participate_in_poll!(@local_parent, @poll2.poll_answers.first)
@object_by_recipient = @local_leia.participate_in_poll!(@local_parent, @poll2.poll_answers.first) @object_by_recipient = @local_leia.participate_in_poll!(@local_parent, @poll2.poll_answers.first)
@dup_object_by_parent_author = @object_by_parent_author.dup @dup_object_by_parent_author = @object_by_parent_author.dup
@object_on_remote_parent = @local_luke.participate_in_poll!(@remote_parent, @remote_parent.poll.poll_answers.first) @object_on_remote_parent = @local_luke.participate_in_poll!(@remote_parent, @remote_parent.poll.poll_answers.first)
end end
let(:build_object) { PollParticipation::Generator.new(alice, @status, @poll.poll_answers.first).build } let(:build_object) { PollParticipation::Generator.new(alice, @status, @poll.poll_answers.first).build }
it_should_behave_like 'it is relayable' it_should_behave_like 'it is relayable'