forked from bofh/fetsite
AutoCommit Mon Jun 8 22:03:14 CEST 2015
This commit is contained in:
1
app/controllers/.#calentries_controller.rb
Symbolic link
1
app/controllers/.#calentries_controller.rb
Symbolic link
@@ -0,0 +1 @@
|
||||
andreas@andreas-ThinkPad-S430.13138:1433770009
|
||||
@@ -48,7 +48,7 @@ u=current_user
|
||||
end
|
||||
|
||||
def current_ability
|
||||
@current_ability ||= Ability.new(current_user, request)
|
||||
@current_ability ||= Ability.new(current_user, request, params[:key])
|
||||
end
|
||||
def default_url_options
|
||||
{locale: I18n.locale, theme: nil , ansicht: nil}
|
||||
|
||||
@@ -3,12 +3,13 @@ class CalendarsController < ApplicationController
|
||||
# GET /calendars.json
|
||||
load_and_authorize_resource
|
||||
def index
|
||||
@calendars = Calendar.all
|
||||
@calentries = Calentry.all
|
||||
@calendars = Calendar.accessible_by(current_ability)
|
||||
@calentries = Calentry.accessible_by(current_ability)
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
format.json { render json: @calendars }
|
||||
format.ics
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ class CalentriesController < ApplicationController
|
||||
|
||||
respond_to do |format|
|
||||
format.html {redirect_to rubriken_path}
|
||||
|
||||
format.ics
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user