Merge branch 'development' into fix/account_creation

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

Remove redundant database tables and columns

Remove references to Org#parent_id

Fix for "Plan Download". ...

This is a clean up of code based on PR comments.

Also updated the ExportablePlan helper method as_csv() to work with the selections made on the Plan Download page.

Issue #1730

Fix for "Plan download file not filtering on selection on Download page". ...

Issue #1730

Also included is a fix for rendering if saving a new plan or editing a plan that results in
errors.

Removed 'Other' org from combobox to avoid confusion

Fixed empty 'Organisation' field issue

Added automatic selection of 'Other' org when using unlisted org

switched back to allowing multiple themes per guidance and fixed error display for 'accept terms' on create account form ...

updated tooltip

fixed issue with checkbox error display, removed old JS for create account form, fixed create account form namespacing (#1686)

fixed issue with checkbox error display, removed old JS for create account form, fixed create account form namespacing (#1686)

Merge branch 'development' into master

Add <fieldset> markup to radio buttons and check boxes #1448 ...

remove the 'for' attribute for any check boxes or radio buttons that are embedded within the <label> tag

reverted changes to buttons <button><a ...></a></button> is invalid HTML5 and does not work in all browsers (#1636)

Fix buttons that do not provide a visual cue indicating that they have focus #1443 (#1600)

Add form validations (#1588) ...

removed formtastic

added required asterisks to create plan page and updated JS logic of Org selection

added namespaces to edit profile, sign in and create account forms to fix duplicate id issue

fixed JS behind links and their validation

fixed JS behind links and their validation

removed console.log statement and added rake tasks for data validation cleanup

Add form validations

removed formtastic

added required asterisks to create plan page and updated JS logic of Org selection

added namespaces to edit profile, sign in and create account forms to fix duplicate id issue

fixed JS behind links and their validation

fixed JS behind links and their validation

removed console.log statement and added rake tasks for data validation cleanup

made recommended adjustments

reverted schema.rb

removed unecessary other_org query

Accessibility - Form fields missing labels #1445

added check for public plan when adding copyright info to PDF coversheet

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

Fixes #1397 ...

* after_sign_in|up : Check for paths not urls (so that it works on localhost/http)
* remove duplicate IDs from sign_up page by not including it in modal too (related to #1064)

fixed issue with text downloads ...

switched is_a? to respond_to?

any paginable link or form uses paginable-action selector to avoid conflicting with other wider selectors. DMPRoadmap/roadmap#1334

Refactored paginable concern to accommodate proper retaining of query_params. DMPRoadmap/roadmap#1214 ...

ammended test for paginable concern. DMPRoadmap/roadmap#1214

solving JS linter problems

fixed merge conflict

update question headings for questions with options to display question text

fix typo

fixes 1293 and one other reported issue

added orcid to plan download coversheet

Merge pull request #1303 from CDLUC3/issue1275 ...

Updates to Super Admin Users page

added active flag to users and updated admin users page to allow admin to update the value ...

updated column text

Updated inactive message

updated mailers to exclude inactive users except for sharing and devise emails about their account

added tests for super admin users. added functionality for super admin to edit user info

added org and created columns to users table

swapped in good schema.rb

removed debug line

added new field to schem.rb manually

fixed schema.rb

added button to go back to users and switched from and to &&

fixed typo in schema.rb