Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display reshared poll #5782

Merged
merged 2 commits into from Mar 15, 2015

Conversation

@svbergerem
Copy link
Member

commented Mar 15, 2015

Supersedes #4928 and #5565.

@@ -14,11 +14,18 @@ app.views.Poll = app.views.Base.extend({

presenter: function(){
var defaultPresenter = this.defaultPresenter();
var show_form = defaultPresenter.loggedIn &&
!this.model.attributes.already_participated_in_poll;
var isReshare = (this.model.get('post_type') == 'Reshare');

This comment has been minimized.

Copy link
@houndci-bot

houndci-bot Mar 15, 2015

Expected '===' and instead saw '=='.

@svbergerem svbergerem force-pushed the svbergerem:reshared-poll branch 3 times, most recently from 6cb7123 to f023897 Mar 15, 2015

@goobertron

This comment has been minimized.

Copy link

commented Mar 15, 2015

Nice work! How about, for the text, "You can participate in this poll on the <%= original_post_link %>." Your text is fine, but this version seems, I think, a little less formal and more inviting.

@svbergerem svbergerem force-pushed the svbergerem:reshared-poll branch from f023897 to 81cd175 Mar 15, 2015

@svbergerem

This comment has been minimized.

Copy link
Member Author

commented Mar 15, 2015

@goobertron Thank you for your suggestion. I changed the text.

@goobertron

This comment has been minimized.

Copy link

commented Mar 15, 2015

Great, thanks!

@jhass jhass merged commit 81cd175 into diaspora:develop Mar 15, 2015

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
hound Hound has reviewed all the changes!
jhass added a commit that referenced this pull request Mar 15, 2015
@jhass

This comment has been minimized.

Copy link
Member

commented Mar 15, 2015

Thank you!

@jhass jhass added this to the next-major milestone Mar 15, 2015

This was referenced Mar 15, 2015

@svbergerem svbergerem deleted the svbergerem:reshared-poll branch Mar 15, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.