Added a rake task to port orcids from the old field in the users table over to the new user_identifiers table. Removed the old unworking migration (because orcid is not in the table so it never runs). Added a new db migration to remove the old users.orcid_id column. The rake task would need to be run prior to the db migration though so commenting it out for now

leaving the two migrations caused schema issues this cleans it up

change question_format to use enum rather than bits

merge optimistic locking into dev

Optimistic Locking ...

- add bit field to question_format so we don't have to test strings to determine format

- add isOptionBased to question so we dn't have to do multiple string comps for this - there was a boolean already in the DB not being used

- add migration to add bit field

- add migration to add lock_version field to answer

- change answers_controller to do optimistic locking

- change answers controller not to redirect to plans/phase/edit as it wasn't doing anything

- introduced answers/update.js.erb to handle the return from /answers/update.

- to do the conflict resolution you need the old answer and new answer objects. Tried using clone but it doesn't work because it only does a shallow copy. So adopted a "nuclear-option" deep copy but it's a bit much. A compromise would be better.

config/initializers/locale.rb getters/setters pointing at FastGettext. en-UK renamed to en_GB. DMPRoadmap/roadmap#98

URLs without locale param

updated languages en-US en-UK to en_US en_UK

Merge pull request #30 from DigitalCurationCentre/final_schema ...

updated migrations to comply with validations, added guidance-guidanc…

updated migrations to comply with validations, added guidance-guidance_groups many to many relationship back in for migration

added check to migration to see if new_plan table exists prior to attempt to create a new NewPlan model

first step in reducing page edit sql queries

fixed merge conflicts in schema.rb

ran db:migrate on test

init commit of deep_copy for templates [untested]

fixed a few merge conflicts

added theme unit tests and started cleanup of remaining existing tests

merge in changes from origin

port of plan creation and editing to new data model

removed region_group (and underlying table) and replaced with has_and_belongs_to_many relationship on Region so that we can do region.super_region and region.sub_regions. Added unit tests for Region

added templates history page

Moved orcid_id from users table to user_identifiers. Added option_based flag to question_formats. switched Object.const_defined to table_exists checks in db migrations because rails loads references to classes on demand so the objects are likely not defined when the migrations run. safer to check for the underlying table's existence

resolved merge conflicts

replaced use of fixtures with db/seeds.rb. no point in maintaining both

added new seed file that works with new schema. commented out plans and answers for now though because plan model is unfinished

Added checks to migration files that manipulate data to make sure that the model they are attempting to access is defined in the current codebase

added some more attr_accessible attributes for new fields. finished up seed.rb file.

started seeds.rb rebuild to work with new schema. Removed guidance_in_group association from guidance. added some attr_accessible attributes

added checks in migration code where we try to manipulate data belonging to a table that no longer exists in the current codebase

resolved merge conflicts