Browse code Merge pull request #969 from CDLUC3/issue938 consolidated edit/add view and controller action for annotations dev
commit 4b1c7e8f6491e9b7363f46c9b3725186489cf043 2 parents a5d2a5e + 150b64e Jose Lloret authored on 19 Dec 2017 GitHub committed on 19 Dec 2017

Showing 15 changed files

• app/controllers/annotations_controller.rb
• app/controllers/roles_controller.rb
• app/views/annotations/_add.html.erb
• app/views/annotations/_edit.html.erb
• app/views/annotations/_new_edit.html.erb
• app/views/annotations/_show.html.erb
• app/views/paginable/plans/_privately_visible.html.erb
• app/views/phases/_admin_show.html.erb
• app/views/phases/_guidances_notes.html.erb
• app/views/questions/_show_question.html.erb
• app/views/sections/_edit_section.html.erb
• app/views/sections/_show_section.html.erb
• config/routes.rb
• lib/assets/javascripts/views/questions/show.js
• test/functional/annotations_controller_test.rb

Ignore Space Show notes View app/controllers/annotations_controller.rb

Ignore Space Show notes View app/controllers/roles_controller.rb

Show notes View app/views/annotations/_add.html.erb 100644 → 0

Show notes View app/views/annotations/_edit.html.erb 100644 → 0

Ignore Space Show notes View app/views/annotations/_new_edit.html.erb 0 → 100644

Ignore Space Show notes View app/views/annotations/_show.html.erb

Ignore Space Show notes View app/views/paginable/plans/_privately_visible.html.erb

Ignore Space Show notes View app/views/phases/_admin_show.html.erb

Ignore Space Show notes View app/views/phases/_guidances_notes.html.erb

Ignore Space Show notes View app/views/questions/_show_question.html.erb

Ignore Space Show notes View app/views/sections/_edit_section.html.erb

Ignore Space Show notes View app/views/sections/_show_section.html.erb

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View lib/assets/javascripts/views/questions/show.js

Ignore Space Show notes View test/functional/annotations_controller_test.rb

Show line notes below