Merged DMP Roadmap V2.1.4

Merge pull request #2282 from DMPRoadmap/issue2240 ...

These feature are part of the request for improving the Admin view of

These feature are part of the request for improving the Admin view of ...

users.

Changes:
- on the Editing profile of a user the School or Department dropdown
menu has been made the same horizontal size as other inputs.
- A link has been created on the Users page from Plans (i.e, no. of
plans) to a Plans page for the user.

Fix for #2240.

Replaced include by prepend for DMPOPIDoR modules

Merge pull request #2266 from DMPRoadmap/issue2240 ...

Updated functionality for Admin View of Users.

Added functionality to allow Org admins to export their org's templates. ...

Re-used the template_export templates template_export.docx.erb
and template_export.pdf.erb.

Changes:
 - Moved templates template_export.docx.erb and template_export.pdf.erb
to a separate view folder template_exports.
- Added functionality for Org admins to export both current and historic
templates for their organisation. The version name has been appended to
the templates, e.g., My_Template_v0.docx or  My_Template_v5.pdf.

Fix for issue #2091.

Updated functionality for Admin View of Users. ...

Changes:
 - for Super Admins: Added user department and plans.
 - for Org Admins:
        (1) The user view now has a clickable link for opening up
            a view of a user's profile and plans.
        (2) In a user's profile view the Department if it exists for the
            organisation is editable. The Organisation must have
            departments in systerm to avail of this functionality.

Fix for #2240.

Merged DMPRoadmap V2.1.3

capture status

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.

Solved issue with privately_private visibility

Moved datasets form to its own tab

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.

added plans fulltext api using pagination

Merge pull request #2121 from DMPRoadmap/issue/2118 ...

updated permissions and routing around public template export

Merge branch 'development' into feature/reviewer_role

refactored review access from role to permission

Allow org admins to view 'share plan' page. ...

Changes:
 - Updated share? method in the class PlanPolicy.
 - Also fixed Rubocop warnings in PlanPolicy.
 - Updated _navigation.html.erb and _share_form.html.erb
   to enable org admins to view the Share tab of org plans.

Fix for #2090.

remove auth verification on public_pages, update model accessors to ? methods

updated permissions and routing around public template export

Static pages edition integration

Merged with DMPRoadmap:master

Added themes API policy

Moved API to API/V0 module

Refactor routes for better maintainability ...

- Remove redundant routes (Fixes #1699, Fixes#1570)
- Remove redundant actions
- Remove redundant policy methods
- Fix invalid actions (public methods defined on controllers)
- Set concern methods as private
- Extract session locale method from ApplicationController into its own controller
- Explicitly define actions in statics controller for better readability

Added authentication to extract URL

Make sections within a phase sortable

All public templates should be exportable

update_email_preferences action only authorized for signed_in user. DMPRoadmap/roadmap#1514

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