andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Added the verleihkalender view

Browse Source
This commit is contained in:
Pet
2018-05-15 20:15:01 +02:00
parent 165268d695
commit 2afbd0fa45
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/infoscreen_header_provisorisch.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 42 KiB

5
app/controllers/home_controller.rb
View File

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

5
app/models/ability.rb
View File

@@ -4,7 +4,7 @@ class Ability
include CanCan::Ability include CanCan::Ability
def initialize(user,request=nil,key=nil) def initialize(user,request=nil,key=nil)
tunet=IPAddr.new("128.131.95.0/24") 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?) loggedin=!(user.nil?)
unless key.nil? unless key.nil?
k=Key.find_by_uuid(key) 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))) 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 can :infoscreen, User
end 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")) if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
can [:show,:answer, :create,:new, :create_from_template, :flag], Survey::Question can [:show,:answer, :create,:new, :create_from_template, :flag], Survey::Question