bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://github.com/fetsite/fetsite

Browse Source
This commit is contained in:
Andreas Stephanides
2014-07-17 17:40:43 +05:30
parent a0a0306c23 dce0b1507e
commit f8a5b57050
5 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/ability.rb
View File

@@ -46,6 +46,7 @@ class Ability
cannot :delete, Fetprofile
cannot :delete, Studium
cannot :delete, Modul
cannot :delete ,Gremium
end
# Rechteverwaltung fuer Neuigkeiten

4
app/models/gremium.rb
View File

@@ -20,8 +20,8 @@ class Gremium < ActiveRecord::Base
TEXT={11=>I18n.t("gremium.filter.berufung.text"),12=>I18n.t("gremium.filter.habil.text")}
attr_accessible :desc, :name, :typ, :geschlecht,:thema_id, :memberships_attributes
has_many :memberships # Mitgliedschaften bei dem Gremium
has_many :nlinks, as: :link
has_many :memberships, dependent: :destroy # Mitgliedschaften bei dem Gremium
has_many :nlinks, as: :link, dependent: :destroy
scope :search, ->(query) {where("gremien.name like ? or gremien.desc like ?", "%#{query}%", "%#{query}%")}
belongs_to :thema # Gehört zu einem Thema

2
app/models/thema.rb
View File

@@ -30,7 +30,7 @@ include Rails.application.routes.url_helpers
unless translation.try(:updated_at).nil?
translation.updated_at < 2.month.ago
else
true
false
end
end
def is_wiki?

26
app/uploaders/attachment_uploader.rb
View File

@@ -19,15 +19,39 @@ end
def store_dir
"uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
end
def cover
manipulate! do |frame, index|
index== 0 ? frame.convert(:jpg) : nil
end
end
version :thumb do
process :cover
process :resize_to_fill => [64, 64]
def full_filename(for_file)
super.chomp(File.extname(super)) + '.jpg'
end
end
version :cover do
process :cover
process :resize_to_fit => [64,64]
process :convert => :jpg
def full_filename(for_file)
super.chomp(File.extname(super)) + '.jpg'
end
end
version :thumb_small do
process :resize_to_fill => [32, 32]
end
version :thumb_big do
process :resize_to_fill => [200,200]
process :cover
process :resize_to_fill => [200, 200]
process :convert => :jpg
def full_filename(for_file)
super.chomp(File.extname(super)) + '.jpg'
end
end
version :resized do
process :resize_to_fit => [1024,1024]

2
app/views/layouts/application.html.erb
View File

@@ -3,7 +3,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="./public/favicon.ico">
<link rel="shortcut icon" href="http://glonass.htu.tuwien.ac.at/favicon.ico">
<!--<link rel="shortcut icon" href="http://www.fet.at/favicon.ico">-->
<title>Fetsite</title>