Merge pull request #219 from williamschey/master

Hey hey
2014-02-06 10:57:33 +01:00 · 2014-02-06 10:57:33 +01:00 · de63010060
commit de63010060
parent e94676b6a4 86829597b6
1 changed files with 5 additions and 1 deletions
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@ -353,7 +353,11 @@ class DmsfFile < ActiveRecord::Base
                    if x.is_a?(ActiveRecord::Relation)
                      project_included = x.first.id == dmsf_file.project.id        
                    else
+                      if dmsf_file.project
                        project_included = x[:id] == dmsf_file.project.id
+                      else
+                        project_included = false
+                      end
                    end
                  end
                end