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
Merged

Display reshared poll #5782

merged 2 commits into from
Mar 15, 2015

Conversation

svbergerem
Copy link
Member

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');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@svbergerem svbergerem force-pushed the reshared-poll branch 3 times, most recently from 6cb7123 to f023897 Compare March 15, 2015 15:46
@goobertron
Copy link

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
Copy link
Member Author

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

@goobertron
Copy link

Great, thanks!

@jhass jhass merged commit 81cd175 into diaspora:develop Mar 15, 2015
jhass added a commit that referenced this pull request Mar 15, 2015
@jhass
Copy link
Member

jhass 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 reshared-poll branch March 15, 2015 19:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants