| 2018-05-23 |

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
briley
committed
on 23 May 2018
|
Merge pull request #1491 from CDLUC3/contributions
...
Final cleanup for Super Admin Notifications PR
Brian Riley
authored
on 23 May 2018
GitHub
committed
on 23 May 2018
|
Ruby Upgrade v2.4.4
...
----------------------------------------
cleaning unused gems and upgrade to Ruby v2.4.1
fix node modules issues when running the upgrade
update travis.yml to Ruby v2.4.1
Remove Friendly Id gem and related code references.
Upgrading the Devise, Omniauth and Pundit gems and removing version numbers
Upgrading views related gems like recaptcha, formtastic, dragonfly
Upgrade development group gems like kaminari, byebug, better_errors, web-console, binding_of_caller, rack-mini-profiler
Upgrade test group gems like racktest, webmock, sqlite, simplecov
Upgrading Exporting and Internalization gems in the Gemfile
Ruby upgrade to 2.4.4
Fix assert nil warnings in tests
reremoved administrate gem
fixed merge conflicts
bhavi
authored
on 1 May 2018
briley
committed
on 23 May 2018
|
| 2018-05-16 |
Implemented Notifications
...
updated tests to work with current test infrastructure
forgot to add test file
switched from url to path to correct 'Mixed content https vs http' issues
Quentin Sonrel
authored
on 29 Mar 2018
briley
committed
on 16 May 2018
|
| 2018-04-10 |
Fix failing test
Jimmy Angelakos
committed
on 10 Apr 2018
|
| 2018-04-06 |
added base_template_org and updated write plan to show correct org in guidance tab
...
updated example answers logic
added missing code to answers conroller and fixed test
Brian Riley
committed
on 6 Apr 2018
|
| 2018-03-20 |
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
briley
authored
on 15 Mar 2018
Brian Riley
committed
on 20 Mar 2018
|
| 2018-02-23 |
removed side effects when generating or removing API token. Removed org_id method from User and use after_update callback instead. #1060
Jose Lloret
committed
on 23 Feb 2018
|
| 2018-02-13 |
migration to add complete flag to plans. #154
...
Integrate pre-fetching plan and phase from 25e2669
after_save callback for answer model with tests. #154
rake task to update completed plans. #154
statistics#completed_plans action done. #154
HTML view for completed plans and tweaks to JS file associated. #154
Jose Lloret
committed
on 13 Feb 2018
|
| 2018-01-30 |
changes requested by Jose
...
fixed test
briley
committed
on 30 Jan 2018
|
| 2018-01-29 |
added super admin org pages
...
turned shib DS off
fixed tests
fixed tests
Brian Riley
authored
on 27 Jan 2018
briley
committed
on 29 Jan 2018
|
| 2018-01-19 |
public DMPs paginablerised. DMPRoadmap/roadmap#1055
...
public DMPs templates paginablerised. DMPRoadmap/roadmap#1055
plans visible to org admin paginablerised. DMPRoadmap/roadmap#1055
guidances paginablerised. DMPRoadmap/roadmap#1055
guidance_groups paginablerised. DMPRoadmap/roadmap#1055
remove tablesorter class from paginable views. Introduce Clear search results when ALL search results are active. DMPRoadmap/roadmap#1055
guidance policy for paginable/guidance/index/:page. DMPRoadmap/roadmap#1055
Jose Lloret
committed
on 19 Jan 2018
|
| 2018-01-04 |
updated logic to retrieve guidance
...
updated edit plan page's guidance section
added expand/collapse all to guidances
moved guidance collection logic to plan model
added uinit test and fixed broken test
removed unecessary hash from view
briley
committed
on 4 Jan 2018
|
Merge pull request #979 from CDLUC3/revise_admin_publish
...
Admin Guidance page - revise publish action #871
Brian Riley
authored
on 4 Jan 2018
GitHub
committed
on 4 Jan 2018
|
Revise Publish action on Guidances page (#871)
...
Getting the tests to pass
bhavi
committed
on 4 Jan 2018
|
| 2017-12-22 |
Templates table revisions #900 (In Progress)
...
added tests
updates to controller and model methods
updated view
tested and adjusted scoping queries
added unit tests for new latest customization queries
updated tests
updated tests and added predefined scopes back to funders templates
finialized tests for new template page
removed debug statements
bhavi
authored
on 20 Dec 2017
Brian Riley
committed
on 22 Dec 2017
|
| 2017-12-11 |
Merge pull request #902 from CDLUC3/issue813
...
Make templates page usable for Org Admins and Super Admins
Sam Rust
authored
on 11 Dec 2017
GitHub
committed
on 11 Dec 2017
|
| 2017-12-09 |
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
Brian Riley
committed
on 9 Dec 2017
|
| 2017-12-08 |

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
briley
authored
on 27 Nov 2017
Brian Riley
committed
on 8 Dec 2017
|
| 2017-12-07 |
remove the count on shared column
bhavi
committed
on 7 Dec 2017
|
| 2017-12-05 |
removed after_create callback for answers since no longer is needed after introducing transactions. DMPRoadmap/roadmap#893
...
unit test for answer#is_valid?. DMPRoadmap/roadmap#893
answer#update based on current_user. input text for answer based on either answer.text or question.default_text. DMPRoadmap/roadmap#893
renamed answers#update to answers#create_or_update and added new tests. DMPRoadmap/roadmap#893
Jose Lloret
committed
on 5 Dec 2017
|
| 2017-11-27 |
Add shared column in Plans table on Dashboard(#545)
bhavi
committed
on 27 Nov 2017
|
concern to validate and parse an array of object links. DMPRoadmap/roadmap#819
...
validator for links attribute at templates. DMPRoadmap/roadmap#819
funder and sample links visible in funder templates html view. DMPRoadmap/roadmap#819
links view and its JS associated. DMPRoadmap/roadmap#819
Jose Lloret
committed
on 27 Nov 2017
|
| 2017-11-22 |
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
briley
authored
on 16 Nov 2017
Brian Riley
committed
on 22 Nov 2017
|
conditional_user_mailer concern for delivering email according to preferences. DMPRoadmap/roadmap#811
...
unit test for the concern. DMPRoadmap/roadmap#811
deliver_if recipients keyword accepts User or Array of Users. DMPRoadmap/roadmap#811
conditional email for users.new_comment, owners_and_coowners.visibility_changed. DMPRoadmap/roadmap#811
conditional email for users.added_as_coowner. DMPRoadmap/roadmap#811
conditional email for admins.feedback_requested. DMPRoadmap/roadmap#811
Jose Lloret
committed
on 22 Nov 2017
|
| 2017-11-21 |
Merge pull request #844 from DMPRoadmap/issue155
...
Adjusted front-page content for #155
Brian Riley
authored
on 21 Nov 2017
GitHub
committed
on 21 Nov 2017
|