sync with Roadmap #60
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pulling fixes for template customization back into development
pulling in bugfix for text downloads
Merging in latest bug fixes
Pulling in latest bug fixes
Remove administrate gem and files
removing administrate gem and fix for IE bug
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
---------------------------------------- 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
Ruby Upgrade v2.4.4
Final cleanup for Super Admin Notifications PR
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. #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. #1407 section#create refactored. #1407 sections loaded on demand for a phase. #1407 ExpandAll triggers click instead of using collapse. #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. #1377 annotations moved to org_admin namespace. #1377 annotations_controller#(create|update|destroy) with test associated. #1377 flash notice for successful action carried out. #1377 flash notice for success actions. create? method for annotation policy. #1377 started refactor of sections/questions fixed nil references. #1462 annotations as fields_for nested attributes. #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. #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. #1495 improved customization template search against all funder templates. #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. #1502 removed console.log fixed JS for section/question annotation loading tinymce when section show only permits customisation. #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
Template Versioning
Development
updated schema to remove friednly_id_slugs table per changes in ruby_upgrade
Fixed issue with Search on public Templates page
Pulling in minor bugfix
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.