added constants for all perms in model

sort out post merge issues

fix up post merge errors

mege in head changes

trying to reduce data access queries. Needs more work

Merge branch 'final_schema' of https://github.com/DigitalCurationCentre/roadmap into final_schema

removed slugs unique requirement from phases ** may break other code

finalized helper tests. additional tweaks to Plan tests

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

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

re-wrote guidance_for_org fuction to hit the db less

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

updted some stale references to Project and Dmptemplate. built more unit tests for Plan methods. Commented out a lot of methods that appear to be unused

removed NewPlan, AdminUser models. Updated API base controller to check auth via token type and org

removed org_token_permission and users_perm models. They are declared via a has_and_belongs_to_many relationship which designates the underlying table so there is no need for a model. Removed old organisation_type which has been replaced

removed old Ability model which was used by the CanCan gem. added some more test coverage for Org and User

removed User.org_type method and updated calls to in on some template views to use the new org.funder? instead

filled in test coverage gaps. Removed duplicate User.can_grant_api_to_orgs? method

Merge branch 'final_schema' of https://github.com/CDLUC3/roadmap into final_schema

commented out unecessary org_token_permission model. We use a has_and_belongs_to_many relationship which defines the join table directly

customizations generate new templates or template versions

fixed minor typo in deep_copy for question

some cleanup of irrelevant objects (e.g. removal of remaining OrganisationType)

commented out organisation getter/setter in user. switched calls to org

removed references to organisation_id in several models and replaced with .org.id

added some missing unit tests. fixed typo on Template.has_customisations? method

renamed projects_helper to plans_helper. moved template.settings tests to settings:template_test

fixed bug where sections not editable, questions not saveable

Merge branch 'final_schema' of https://github.com/DigitalCurationCentre/roadmap into final_schema

move plan list settings from project to plan

added a few attributes to Plan and User attr_accessible sections