Added the verleihkalender view

app/controllers/home_controller.rb

@@ -21,10 +21,15 @@ class HomeController < ApplicationController
 
   end
   def infoscreen
-    authorize! :infoscreen, User 
+    authorize! :infoscreen, User
     @neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).where(flag_infoscreen: true)
     render layout: false
   end
+  def verleihkalender
+    authorize! :verleihkalender, User
+    #@neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).where(flag_infoscreen: true)
+    render layout: false
+  end
   def kontakt
     t=YAML.load_file("#{::Rails.root.to_s}/config/contact_topic.yml")
     @themen = Thema.where(:id=>t)

app/models/ability.rb

@@ -4,7 +4,7 @@ class Ability
   include CanCan::Ability
   def initialize(user,request=nil,key=nil)
     tunet=IPAddr.new("128.131.95.0/24")
-local=IPAddr.new("127.0.0.1")
+    local=IPAddr.new("127.0.0.1")
     loggedin=!(user.nil?)
     unless key.nil?
       k=Key.find_by_uuid(key)
@@ -16,6 +16,9 @@ local=IPAddr.new("127.0.0.1")
     if  (user.has_role?("fetuser") || user.has_role?("fetadmin") || tunet.include?(IPAddr.new(request.remote_ip)) || local.include?(IPAddr.new(request.remote_ip)))
     can :infoscreen, User
     end
+    if  (user.has_role?("fetuser") || user.has_role?("fetadmin") || tunet.include?(IPAddr.new(request.remote_ip)) || local.include?(IPAddr.new(request.remote_ip)))
+    can :verleihkalender, User
+    end
 
     if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
       can [:show,:answer, :create,:new, :create_from_template, :flag], Survey::Question
@@ -29,10 +32,10 @@ local=IPAddr.new("127.0.0.1")
       can [:delete,:flag_template], Survey::Question
     end
     #---------------------------------------------------
-    
+
     can [:index,:hide], Comment
     can :show, Comment
-    
+
     if loggedin
       can [:create,:new], Comment
       can [:comment], Comment
@@ -52,7 +55,7 @@ cannot :destroy, Comment
     can [:create, :show], Beispiel, flag_delete: false
     if loggedin
       can :like, Beispiel
-      can :dislike, Beispiel    
+      can :dislike, Beispiel
     end
     if ((user.has_role?("moderator",Beispiel)) || user.has_role?("fetuser") || user.has_role?("fetadmin"))
       can :flag, Beispiel
@@ -76,22 +79,22 @@ cannot :destroy, Comment
       can :manage, Studium
       #can :manage, Beispiel
       can :comment, Beispiel
-      
+
       can :manage, Lecturer
-      
+
     end
     unless user.has_role?("fetadmin")
-      cannot :delete, Studium    
+      cannot :delete, Studium
       cannot :delete, Modulgruppe
       cannot :delete, Modul
-  
+
     end
     if user.has_role?("fetadmin")
     can [:index, :parse, :show], Crawlobject
 end
     #-----------------------------------------------------
     # Rechteverwaltung fuer Informationen
-    can [:show, :index,:faqs], Themengruppe, :public=>true  
+    can [:show, :index,:faqs], Themengruppe, :public=>true
     can [:show], Thema, :isdraft=>false,  :themengruppe=>{:public=>true}
     can :show, Frage
     if loggedin
@@ -133,7 +136,7 @@ end
     unless user.has_role?("fetadmin")
       cannot :delete, Gallery
     end
-    
+
     #-----------------------------------------------------
     # Rechteverwaltung fuer Mitarbeiter
     can [:show, :index], Fetprofile
@@ -149,7 +152,7 @@ end
       cannot :delete, Fetprofile
       cannot :delete ,Gremium
     end
-    
+
     #-----------------------------------------------------
     # Rechteverwaltung fuer Neuigkeiten
     can :index, Rubrik
@@ -171,9 +174,9 @@ end
       can :shownonpublic, Rubrik
       can :manage, Nlink
     end
-    if user.has_role?("newsadmin") || user.has_role?("fetadmin") 
+    if user.has_role?("newsadmin") || user.has_role?("fetadmin")
       can :addmoderator, Rubrik
-    end    
+    end
     if user.has_role?("fetadmin")
       can :addfetuser, User
       can :addfetadmin, User
@@ -184,8 +187,8 @@ end
       can :manage, User
       can :set_preferred_theme, User
     end
-    
+
-    if user.has_role?("newsadmin") || user.has_role?( "fetadmin") || user.has_role?( "fetuser") 
+    if user.has_role?("newsadmin") || user.has_role?( "fetadmin") || user.has_role?( "fetuser")
       can :manage, Rubrik
       can :manage, Neuigkeit
       can :showunpublished, Neuigkeit
@@ -200,7 +203,7 @@ end
       can [:show, :edit, :update,:new,:create,:write, :write_etherpad, :read_from_etherpad, :dump_to_etherpad, :search], Document
       can :manage, Meeting
       can :manage, Meetingtyp
-    end    
+    end
     if user.has_role?("fetadmin")
       can :manage, Document
     end
@@ -213,19 +216,19 @@ end
     end
     if user.has_role?( "fetadmin")
       can :manage, Meetingtyp
-      
+
     end
-    
+
-    # Rechteverwaltung Kalender 
+    # Rechteverwaltung Kalender
-    can [:show, :index], Calendar, :public => true 
+    can [:show, :index], Calendar, :public => true
     can [:showics], Calendar
     # can [:show], Calentry
-    if  (!k.nil? && k.typ==1 && (k.user.has_role?("fetuser")||k.user.has_role?("fetadmin")))  
+    if  (!k.nil? && k.typ==1 && (k.user.has_role?("fetuser")||k.user.has_role?("fetadmin")))
       if k.parent.nil?
         can [:show,:index], Calendar
       else
         can [:show], Calendar, id: k.parent_id
-      end 
+      end
     end
 
     if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
@@ -242,6 +245,6 @@ end
     if user.has_role?("fetadmin")
       can :emails,User
     end
-    
+
   end
 end