Replaced include by prepend for DMPOPIDoR modules

Added Stats chart for org template usage

Models comment changed with rake db:migrate

Merged DMPRoadmap V2.1.3

Added alias types for research_output_types

Plans with Organisation visibility are now displayed even if not complete

Template list should be empty for orgs without templates

Template list in org admin should be empty when org doesn't have a template

Changes to user anonymization tasks for recent roadmap changes

Many export fixes

Research output type should be mandatory

Fix to plan owner name display in Dashboard

Fixed missing research output abbreviation & fullname when creating a plan

Merged DMPRoadmap V2.1.2

Added selectable ResearchOutput Type to ResearchOutput form

Renamed ResearchOutputs columns

Datasets has been renamed as Research outputs

Fix for issue associated with super-admins and department affiliation in a given organisation. (#2165) ...

Changes made:
  - Department policies now allow both org admins and super admins to
    create update and delete departments, whilst org_admins can only do this
    for their own org. Super admins can do it for any org department.
  - When a super admin switches organisation their department_id is cleared.

Fix for issue #2088.

Fix for humanizing the attribute name for feedback_email_msg in error messages. ...

Updated Org model by overriding the ActiveRecord::Base class method self.human_attribute_name.

Fix for #1743.

Fix for foreign key violation error when a department is deleted ...

after some users have added its department_id.

Solution based on blog "Set Foreign keys to null"
https://til.hashrocket.com/posts/jqilnp3d0h--set-foreign-keys-to-null

Fix for issue #2088

Merge pull request #2149 from DigitalCurationCentre/bug/plan_ownership ...

Bug/plan ownership

Add functionality for School/Department for an organisation. ...

Changes:
    - added a Department model whose instances belong to an org and require name.
    - added a DepartmentController and views for create, edit/update and a index view which is a tab
      of 'Organisational Details'.
    - added the optional attribute department_id to User model.
    - added Rspec tests.
    - updated app/controllers/registrations_controller.rb, app/models/org.rb and
      app/models/user.rb to get rid of outstanding Rubocop warnings

    Fix for issue #2088.

Fixed plan visibility answered questions count

fix issue where displayed plan owner was not the creator

rework logic around answer_text for CSV export

fix issue with declaring is_blank?

updated logic so nil answer.text dosent cause errors

If main dataset is not exported, common answers should be exported

Fixed plan copy for plans with datasets

Deactivated CSV & text export