From ff7c1d71bbfb6606e44bae44ea74db029434389a Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sat, 26 Oct 2013 12:49:03 +0200 Subject: [PATCH] =?UTF-8?q?Aktivere=20Rechtemanagement=20f=C3=BCr=20einige?= =?UTF-8?q?=20Controller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attachments_controller.rb | 1 + app/controllers/beispiele_controller.rb | 1 + app/controllers/calentries_controller.rb | 1 + app/controllers/config_controller.rb | 1 + app/controllers/fetzneditions_controller.rb | 1 + app/controllers/fragen_controller.rb | 1 + app/controllers/gremien_controller.rb | 1 + app/controllers/lecturers_controller.rb | 1 + app/controllers/lvas_controller.rb | 1 + app/controllers/memberships_controller.rb | 1 + app/controllers/moduls_controller.rb | 1 + app/controllers/semesters_controller.rb | 2 +- app/controllers/studien_controller.rb | 2 +- app/controllers/themen_controller.rb | 2 ++ app/controllers/themengruppen_controller.rb | 1 + app/models/ability.rb | 11 +++++++---- 16 files changed, 23 insertions(+), 6 deletions(-) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 7647755..40494fa 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -1,6 +1,7 @@ class AttachmentsController < ApplicationController # GET /attachments # GET /attachments.json + load_and_authorize_resource def index @attachments = Attachment.all diff --git a/app/controllers/beispiele_controller.rb b/app/controllers/beispiele_controller.rb index d0d2f7e..1e2438f 100755 --- a/app/controllers/beispiele_controller.rb +++ b/app/controllers/beispiele_controller.rb @@ -1,6 +1,7 @@ class BeispieleController < ApplicationController # GET /beispiele # GET /beispiele.json + load_and_authorize_resource def index @beispiele = Beispiel.all diff --git a/app/controllers/calentries_controller.rb b/app/controllers/calentries_controller.rb index 3452d72..7e0c537 100644 --- a/app/controllers/calentries_controller.rb +++ b/app/controllers/calentries_controller.rb @@ -1,6 +1,7 @@ class CalentriesController < ApplicationController # GET /calentries # GET /calentries.json + load_and_authorize_resource def index @calentries = Calentry.all diff --git a/app/controllers/config_controller.rb b/app/controllers/config_controller.rb index 2192afb..5caffd0 100755 --- a/app/controllers/config_controller.rb +++ b/app/controllers/config_controller.rb @@ -1,4 +1,5 @@ class ConfigController < ApplicationController + load_and_authorize_resource def index end diff --git a/app/controllers/fetzneditions_controller.rb b/app/controllers/fetzneditions_controller.rb index 7b2de9e..7911c6b 100644 --- a/app/controllers/fetzneditions_controller.rb +++ b/app/controllers/fetzneditions_controller.rb @@ -1,6 +1,7 @@ class FetzneditionsController < ApplicationController # GET /fetzneditions # GET /fetzneditions.json + load_and_authorize_resource def index @fetzneditions = Fetznedition.all diff --git a/app/controllers/fragen_controller.rb b/app/controllers/fragen_controller.rb index d30d79f..cac35da 100644 --- a/app/controllers/fragen_controller.rb +++ b/app/controllers/fragen_controller.rb @@ -1,6 +1,7 @@ class FragenController < ApplicationController # GET /fragen # GET /fragen.json + load_and_authorize_resource def index @fragen = Frage.all diff --git a/app/controllers/gremien_controller.rb b/app/controllers/gremien_controller.rb index 597b83a..f2043ac 100644 --- a/app/controllers/gremien_controller.rb +++ b/app/controllers/gremien_controller.rb @@ -1,6 +1,7 @@ class GremienController < ApplicationController # GET /gremien # GET /gremien.json + load_and_authorize_resource before_filter {@toolbar_elements=[]} def verwalten @gremien = Gremium.all diff --git a/app/controllers/lecturers_controller.rb b/app/controllers/lecturers_controller.rb index c861838..c7eefd1 100644 --- a/app/controllers/lecturers_controller.rb +++ b/app/controllers/lecturers_controller.rb @@ -1,6 +1,7 @@ class LecturersController < ApplicationController # GET /lecturers # GET /lecturers.json + load_and_authorize_resource def index @lecturers = Lecturer.all diff --git a/app/controllers/lvas_controller.rb b/app/controllers/lvas_controller.rb index 7a2667c..6680fed 100755 --- a/app/controllers/lvas_controller.rb +++ b/app/controllers/lvas_controller.rb @@ -1,6 +1,7 @@ class LvasController < ApplicationController # GET /lvas before_filter {@toolbar_elements =[]} + load_and_authorize_resource def index @lvas = Lva.all @toolbar_elements=[{:hicon=>'icon-plus-sign',:text =>I18n.t('lva.add'),:path => new_lva_path}] diff --git a/app/controllers/memberships_controller.rb b/app/controllers/memberships_controller.rb index eaacaa8..96c90b7 100644 --- a/app/controllers/memberships_controller.rb +++ b/app/controllers/memberships_controller.rb @@ -1,6 +1,7 @@ class MembershipsController < ApplicationController # GET /memberships/new # GET /memberships/new.json + load_and_authorize_resource def new @membership = Membership.new @membership.fetprofile=Fetprofile.find(params[:fetprofile_id]) diff --git a/app/controllers/moduls_controller.rb b/app/controllers/moduls_controller.rb index a21712c..067f370 100755 --- a/app/controllers/moduls_controller.rb +++ b/app/controllers/moduls_controller.rb @@ -1,6 +1,7 @@ class ModulsController < ApplicationController # GET /moduls # GET /moduls.json + load_and_authorize_resource def index @moduls = Modul.all if @moduls diff --git a/app/controllers/semesters_controller.rb b/app/controllers/semesters_controller.rb index 8a527c4..3c840d4 100755 --- a/app/controllers/semesters_controller.rb +++ b/app/controllers/semesters_controller.rb @@ -1,5 +1,5 @@ class SemestersController < ApplicationController - + load_and_authorize_resource def index @semesters = Semester.all end diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb index f94a440..3b2fe05 100755 --- a/app/controllers/studien_controller.rb +++ b/app/controllers/studien_controller.rb @@ -1,7 +1,7 @@ class StudienController < ApplicationController before_filter {@toolbar_elements =[]} # before_filter :authorize, :only => :verwalten - + load_and_authorize_resource def index @studien = Studium.all @topbar_elements=[{:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"),:path=>studien_path}] diff --git a/app/controllers/themen_controller.rb b/app/controllers/themen_controller.rb index f024c79..118a586 100644 --- a/app/controllers/themen_controller.rb +++ b/app/controllers/themen_controller.rb @@ -1,6 +1,8 @@ class ThemenController < ApplicationController # GET /themen # GET /themen.json + load_and_authorize_resource + def index @themen = Thema.all diff --git a/app/controllers/themengruppen_controller.rb b/app/controllers/themengruppen_controller.rb index 70709ee..17329be 100644 --- a/app/controllers/themengruppen_controller.rb +++ b/app/controllers/themengruppen_controller.rb @@ -1,6 +1,7 @@ class ThemengruppenController < ApplicationController # GET /themengruppen # GET /themengruppen.json + load_and_authorize_resource def index @themengruppen = Themengruppe.all @toolbar_elements = [{:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.new'), :path=>new_themengruppe_path()}] diff --git a/app/models/ability.rb b/app/models/ability.rb index 83ee597..c8d38a3 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -28,16 +28,19 @@ class Ability # For Debug allow everything # Remove this line in production environment and for testing user management - can :manage, :all +# can :manage, :all can :addfetuser, User can :addfetadmin, User can [:show, :index], Studium can [:show, :index], Modulgruppe can [:show, :index], Modul can [:show, :index], Lva - + can [:show,:index], Gallery + can [:show, :index], Themengruppe + can [:show, :index], Fetprofile + can [:show],Gremium # Rechteverwaltung fuer Studien Modul - can :read, Modulgruppe + # Rechteverwaltung Kalender @@ -45,7 +48,7 @@ class Ability can [:showics], Calendar can [:show], Calentry if( user.has_role?("fetuser") || user.has_role?("fetadmin")) - + can :manage,:all can :manage, Modulgruppe can [:show,:index], Calendar