Merge branch 'master' of https://github.com/QutBioacousticsResearchGr…

…oup/bioacoustic-workbench
QutEcoacoustics · Jan 21, 2013 · 44f6779 · 44f6779
2 parents 35d938b + 717ded7
commit 44f6779
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -6,12 +6,18 @@ class HomeController < ApplicationController
 
   def index
 
-
-
     #the_search = Search.new( { :body_params => { :project_ids => [ 4 ],:site_ids => [ ],:audio_recording_ids => [  ] } } )
     #params[:test1] = the_search
     #params[:test2] = the_search.execute_query.all
 
     #raise RuntimeError
+
+    the_format = params[:format]
+
+    if the_format.blank?
+      render
+    else
+      head :not_acceptable
+    end
   end
 end
diff --git a/app/models/permission.rb b/app/models/permission.rb
@@ -8,7 +8,7 @@ class Permission < ActiveRecord::Base
   belongs_to :permissionable, :polymorphic => true
 
   # attr
-  attr_accessible :level, :permissionable_type, :permissionable_id
+  attr_accessible :user_id, :level, :permissionable_type, :permissionable_id
 
   # userstamp
   stampable