Created merge article feature for admins#33
Open
Dreedle wants to merge 28 commits intoAda-C4:masterfrom
Dreedle:master
Open
Created merge article feature for admins#33Dreedle wants to merge 28 commits intoAda-C4:masterfrom Dreedle:master
Dreedle wants to merge 28 commits intoAda-C4:masterfrom
Dreedle:master
Conversation
…ditional to admin new categories controller (new or edit)
…s a blog publisher in test
…est for bodies combining is currently failing
| def new_or_edit | ||
| if params[:action] == "new" | ||
| @category = Category.new | ||
| elsif params[:action] == "edit" && params[:id] |
There was a problem hiding this comment.
Thought: Does the params[:action] in this elsif as well as the one below change the conditional, or could you just use params[:id]
| Article ID | ||
| <%= text_field "other_article_id", "other_article_id", {:autocomplete => 'off', :style => 'width: 30%; margin-left: 10px'} %> | ||
| </span> | ||
| <div style="padding-top:10px"> |
There was a problem hiding this comment.
Can you use a class here instead of inline style?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What I did do:
...merge feature is only available to admin
...merge feature is not available on new articles
...merge feature combines text of the two articles
...merge feature maintains title of just one article
...merge feature removes the other article
-Deployed to heroku with this feature: https://aqueous-reaches-35072.herokuapp.com/
What I did not get to:
...new article having a single author
...new article having comments from both articles