2 files changed, 4 insertions, 11 deletions
diff --git a/app/models/dashboard.rb b/app/models/dashboard.rb
index bcd92de5a..e0857dca3 100644
--- a/app/models/dashboard.rb
+++ b/app/models/dashboard.rb
@@ -28,15 +28,4 @@ class Dashboard
     context.send(:current_organisation)
   end
 
-  def workbench
-    @workbench ||= current_organisation.workbenches.default
-  end
-
-  def workgroup
-    workbench.workgroup
-  end
-
-  def calendars
-    workgroup.calendars.where('(organisation_id = ? OR shared = ?)', current_organisation.id, true)
-  end
 end
diff --git a/app/models/workbench.rb b/app/models/workbench.rb
index eb53af7aa..b6f90c7dc 100644
--- a/app/models/workbench.rb
+++ b/app/models/workbench.rb
@@ -42,6 +42,10 @@ class Workbench < ActiveRecord::Base
     end
   end
 
+  def calendars
+    workgroup.calendars.where('(organisation_id = ? OR shared = ?)', organisation.id, true)
+  end
+
   def self.default
     self.last if self.count == 1
     where(name: DEFAULT_WORKBENCH_NAME).last