Skip to content

Create Merge Feature#34

Open
jbuechs wants to merge 38 commits intoAda-C4:masterfrom
jbuechs:master
Open

Create Merge Feature#34
jbuechs wants to merge 38 commits intoAda-C4:masterfrom
jbuechs:master

Conversation

@jbuechs
Copy link
Copy Markdown

@jbuechs jbuechs commented Mar 31, 2016

Merge feature:

  • shows on edit article page for admin, but not other users
  • does not show on new article page for any users
  • merges content and comments from selected article into edited article
  • deletes merged article

Created Cucumber tests for BDD


def merge
@article = Article.find(params["id"])
merge_article = Article.find(params[:merge_with])
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

It might be good if this logic was in an Article model method instead of directly in the controller

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I moved it to the model

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.

2 participants