Merge branch 'development' into feature/validations

Merge pull request #1802 from DMPRoadmap/refactor/database-cleanup ...

Remove redundant database tables and columns

Remove redundant database tables and columns ...

Remove redundant columns and tables listed in #1382

Update models and factories with new schema structure comments.

Replace YARD documentation with Tomdoc ...

These changes use the YARD gem, but in the lighter Tomdoc format.

You can read more about Tomdoc here: https://tomdoc.org

Update schema annotations on Org model

Remove uniqueness validation from Org abbreviation

Replace boolean DataCleanup rules with migrations ...

Decided it would be a better idea for moving forward if we just constrained these at the DB level.

Update DB schema for MySQL support

Refactored model code for better readability

Update validations with suggestions from team

Add extra validations for all models ...

- Includes specs using the Shoulda gem
- Includes a refactoring of update_numbers to a "sortable" abstraction

Add annotate gem for models and Gemfile

Remove Rails 3 attr accessible from models (#1691)

made contact_email an email input type and added validation to model ...

fixed issue with app name in tests

Template Versioning ...

This commit is a complete refactor of all the pages involved with Template creating/editing. The database, models, controllers, views and JS have all been changed.

------------------------------------------------------------

removed unused template methods from Plan model and removed references to 'Dmptemplate' from tests

started updating model scopes and began creating new unit tests and test_helper methods

Rebased with template customization fixes. updated tests and latest_version queries

Grouping class methods. Grouping scope methods into separate class

removed Template::valid scope method in favour of Template::unarchived

Moved class methods to scope rails flavour.

Removed Template::get_public_published_template_versions method

Model#deep_copy instead of Model::deep_copy. Model#deep_copy without side effects

added customize method to model

updated customize to use new deep_copy and added some tests

fixed test

fixed broken tests after latest PR. DMPRoadmap/roadmap#1341

generate_version with unit test associated

customize with unit test associated

upgrade_customization first attempt

added tests for upgrade_customization

upgrade_customization with several unit test associated

added generate_copy

fixed tests and added test_helper for phase/section/question/annotation/question_option equality for verifying template copy/version/customize

added comments

finished up tests

Removed template.update! in favour of a more re-usable deep_copy with atomic saving.

removed new_copy.save! from templates_controller#copy. Atomic save for upgrade_customization method

renamed to bang notation generate_copy, generate_version, customize and upgrade_customization

question mark methods for generate_version, customize and upgrade_customization

unique indices for template and template customisations. #1341

init functionality for versionable concern

updated errors, added get_new

unique indices for template and template customisations. #1341

new schema dump generated from rails

manually set up the default for org.links

Fix for rake tasks

updated template controller and tests

finished tests for template controller update http verbs for customize and copy methods

updated template versioning intgeration to use new test_helper methods

updated template controller and tests

finished tests for template controller update http verbs for customize and copy methods

updated template versioning intgeration to use new test_helper methods

wired in the new versionable concern

wired in the new versionable concern

updated query structure in template_filter

updated routes and paths

moved phases controller to org_admin namespace

changes to phase model and unit tests

started moving phase views to new org_admin namespace and tests

fixed tests

started fixing up references to moved plan/phase status

started fixing up references to moved plan/phase status

moved js file, fixed tests and manually checked pages

set schema.rb back to sprint2

added in versionable concern and fixed tests

removed unused phase_status method

removed test for phase_status method

fixed issue with template visibility for the default template

fixed issue with default templates and versioning/customization

versionable_test.rb

versionable concern updated

find_or_generate_version! into template, test associated

annotation and question model using has_one through adequately

templates_controller#update action refactored

tweaks to template_test

get_new and get_modifiable test cases for RuntimeError capture

passing parent object ids to children during deep_copy

updated question_option and annotation deep copy

removed old deep_copy method from section model and updated unit tests

removed old deep_copy method from section model and updated unit tests

updates to sections controller, model, routes and tests

fixed broken tests

updated both phases and sections controller to use versionable

fixed tests

started work on new template show/edit

finished up templates UI

fixed tests

consolidated form

consolidated form

fixed history page

removed old view

fixed test

fixed typo in en_US app.po

removed old deep_copy method from section model and updated unit tests

updates to sections controller, model, routes and tests

fixed broken tests

updated both phases and sections controller to use versionable

fixed tests

fixed tests and missing policy

fixed tests

created separate routes for each template index tab

updates to template index page structure

added callback to template model to ensure only one published version

finished up first pass of templates index page

fixed tests

removed current_tab from phase views. DMPRoadmap/roadmap#1407

section#create refactored. DMPRoadmap/roadmap#1407

sections loaded on demand for a phase. DMPRoadmap/roadmap#1407

ExpandAll triggers click instead of using collapse. DMPRoadmap/roadmap#1407

added phase/section/question overview back to template details page

send customizer to show section page

updated button text

updated history controller action

updated controller

updated views

added customization distinction to page title

updates to phase/section to introduce referrer logic and added section-show for customizable

removed old 'edit phase details button

removed edit question partial from section show

tweaks to templates index pages

fixed tests and default scope

added test for default customizations

added namespace to org section of templates index and made autocomplete combobox aware of form namespace

fixed issue with container view

removed old policies

updated statuses of templates

fixed typo in phases/overview view. DMPRoadmap/roadmap#1377

annotations moved to org_admin namespace. DMPRoadmap/roadmap#1377

annotations_controller#(create|update|destroy) with test associated. DMPRoadmap/roadmap#1377

flash notice for successful action carried out. DMPRoadmap/roadmap#1377

flash notice for success actions. create? method for annotation policy. DMPRoadmap/roadmap#1377

started refactor of sections/questions

fixed nil references. DMPRoadmap/roadmap#1462

annotations as fields_for nested attributes. DMPRoadmap/roadmap#1462

commented out version check on template update

removed invalid test

fixed reference to moved partials and family to family_id

fixed question update

updated guidances to work with modified themes form

finished up questions

fixed broken tests

updated preview and customize

fixed issue with sections index

cleaned up remaining issues with template editing and customization

added in check for nil phase to sections create

any user with readable rights should see download tab for a plan. DMPRoadmap/roadmap#1483

updated history to use new template.draft? logic to determine when to show draft icon

added latest check

added check for default option

added checks for historical and customization on preview page

added redirect to show if template is customization

added redirect to show if template is customization

updated ajax success/error for section display

fixed issues with create plan template selection and changing plan visibility

forgot to include model change

reverted schema.rb changes

adding org to chained scope in order to have searchable and sortable templates. DMPRoadmap/roadmap#1495

improved customization template search against all funder templates. DMPRoadmap/roadmap#1499

started work on adding edit/show/new/cancel buttons for questions

added toggle functionality between question show/edit

removed whitespace

made text area the default

updated template statuses

updated class to fix layout

introducing event delegation for sections/questions/annotations. DMPRoadmap/roadmap#1502

removed console.log

fixed JS for section/question

annotation loading tinymce when section show only permits customisation. DMPRoadmap/roadmap#1502

fixed issue with customizating by adding a section/question

removed reload

set focus to first invalid form input

fixed placement of focus for new validation.js

Added joins for customizations table

updated query

fixed initial numbering for new phases/sections

reverted referrer change

made section fields required

added ariatise to new section form

fixed referrer check

fixed inconsistent status message for transfer customization workflow

fixed issue with csv download

fixed csv header

fixed links for customization on history page

updated sections index so new section doesn't show unless its the current template

Added joins for customizations table

added includes to customisable query

fixed issue with paginable history

fixed merge conflicts in templates_controller and questions/_show.html.erb

resolved additional rebase conflict

Resize logo to correct height - fixes #1357

fixed issue with api-token rake task

update org.rb to add end

rake task for statistics API ...

org
- editor ripped whitespace(sorry)
- added grant_api!(token_permission_type) function to model
bugfix.rake
- added rake bugfix: :stats_api_org_admin
- grants stats api permission to orgs with org admins, and api_tokens to org_admins

fixed sort issue for orgs page

changes requested by Jose ...

fixed test

added super admin org pages ...

turned shib DS off

fixed tests

fixed tests

final updates to templates page ...

fixed test

tweaks based on feedback from PR

Revise Publish action on Guidances page (#871) ...

Getting the tests to pass

Merge pull request #902 from CDLUC3/issue813 ...

Make templates page usable for Org Admins and Super Admins

updated org links to use same logic as template links. display org name if no logo ...

removed unecessary line form orgs controller

fixed linter complaint

fixed tests broken by org.links addition

Make templates page usable for Org Admins and Super Admins ...

started work on super admin templates page

consolidated org_admin and super_admin templates page

moved template logic to org_admin module and consolidated logic for super/org admins

switched from submit button click to form submit

fixed issue with unused js var

fixed broken templates controller tests

switched back to submit button

updated template_options route in integration test

fixed broken integration tests caused by moving templates to org_admin namespace

added tests for copy template

added button to get back to 'all templates' page from template edit page

renamed delete button from 'Cancel' to 'Delete' and added proper cancel button to edit section view

made recommended adjustments and accounted for new template visibility functionality

switched out scopes in favor of flagshihtzu helpers

moved link to Themes to Admin menu

fixed broken tests for the public_pages controller

fixes for tests

refactored template current version queries

pulled in customization view changes

Org Admin provide feedback ...

Add Plans page to Org Admin section

added org admin plans page

finsihed up org admin plans page

added feedback complete and updated emails to use email_signature partial

refactored access checks on Plan now that user can have multiple roles (reviewer + ?)

finished feedback completion routine

added tests for new feedback methods

fixes for merge conflicts

fixed issues with plan and user changes

fixed issue with notes controller test

fixed issue with phase controller test

Added Request Feedback button to the share plan page ...

modifications to tooltips and email defaults

moved email constants to usermailer

aded missing colon

started adding in the button to request feedback

modifications to tooltips and email defaults

started adding in the button to request feedback

finsihed adding request feedback button

Removed old comment

switched to roles

updated to role based reviewer

updated user_mailer

moved feedback confirmation defaults to methods on UserMailer

added default visibility back to schema.rb

made adjustments based on PR feedback

refactored to use flagshihtzu function that returns values for flags

Added Feedback Request to Org Details ...

Initial form changes for the New Org Details

added new db components for the org profile tab

split org page into tabs and updated profile form

switched section headers from labels to h3

finished org details tab

added feedback tab

made textarea a tinymce

fixed test broken by org controller update

Added btree back to schema.rb

added foreign keys back to schema.rb

fixed default email for feedback