Mercurial > hg > soundsoftware-site
comparison app/models/project.rb @ 689:a8e402f48723 cannam
Merge from branch "live"
author | Chris Cannam |
---|---|
date | Fri, 16 Sep 2011 15:51:18 +0100 |
parents | 65abc6b39292 |
children | 5e80956cc792 |
comparison
equal
deleted
inserted
replaced
648:7fc15203288c | 689:a8e402f48723 |
---|---|
595 'is_public', | 595 'is_public', |
596 'identifier', | 596 'identifier', |
597 'custom_field_values', | 597 'custom_field_values', |
598 'custom_fields', | 598 'custom_fields', |
599 'tracker_ids', | 599 'tracker_ids', |
600 'issue_custom_field_ids' | 600 'issue_custom_field_ids', |
601 'has_welcome_page' | |
601 | 602 |
602 safe_attributes 'enabled_module_names', | 603 safe_attributes 'enabled_module_names', |
603 :if => lambda {|project, user| project.new_record? || user.allowed_to?(:select_project_modules, project) } | 604 :if => lambda {|project, user| project.new_record? || user.allowed_to?(:select_project_modules, project) } |
604 | 605 |
605 # Returns an array of projects that are in this project's hierarchy | 606 # Returns an array of projects that are in this project's hierarchy |