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.

Sign up for GitHub

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

Jump to bottom

Diary refactoring #2238

Merged
merged 4 commits into from May 29, 2019
Merged

Diary refactoring #2238

merged 4 commits into from May 29, 2019

Conversation

gravitystorm
Copy link
Collaborator

This PR contains some refactoring of diary entries, to use :create and :update methods separate from the :new and :edit methods. The routes are also partially refactored to use resources, and various path names are therefore adjusted.

@Nikerabbit this PR contains some i18n key renames:

  • diary_entries.new.publish_button -> helpers.submit.diary_entry.create
  • diary_entries.edit.subject -> diary_entries.form.subject
  • diary_entries.edit.body -> diary_entries.form.body
  • diary_entries.edit.language -> diary_entries.form.language
  • diary_entries.edit.location -> diary_entries.form.location
  • diary_entries.edit.latitude -> diary_entries.form.latitude
  • diary_entries.edit.longitude -> diary_entries.form.longitude
  • diary_entries.edit.use_map_link -> diary_entries.form.use_map_link

@gravitystorm
Refactor diary entries to use create and update methods
b7893df 
This brings it slightly more into line with resourceful routing.
@gravitystorm
Refactor some diary entry routes to use resources
fbcd2bc
@gravitystorm
Refactor diary entry form
1b1d90a 
This uses the built-in helpers for naming form elements, rather than
having to override with specific i18n labels. It also changes the label
to 'Update', and capitalizes the title on the edit page.
@gravitystorm
rubocop and erblint fixes
9431b47
@tomhughes tomhughes merged commit 9431b47 into openstreetmap:master May 29, 2019
@tomhughes
Copy link
Member

@Nikerabbit note that this moves most of diary_entries.edit to diary_entries.form.

@gravitystorm gravitystorm deleted the diary_refactor branch June 13, 2019 07:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@gravitystorm @tomhughes