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

merge

Browse Source
This commit is contained in:
Andreas Stephanides
2014-12-03 02:41:54 +01:00
parent 87dd70ea44
commit b259c1080a
2 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/ability.rb
View File

@@ -114,7 +114,6 @@ class Ability
unless user.has_role?("fetadmin") unless user.has_role?("fetadmin")
cannot :delete, Rubrik cannot :delete, Rubrik
cannot :delete, Neuigkeit cannot :delete, Neuigkeit
end end
# Calendar # Calendar
if( user.has_role?("fetuser") || user.has_role?("fetadmin")) if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
@@ -130,8 +129,6 @@ class Ability
can [:show], Calentry can [:show], Calentry
if( user.has_role?("fetuser") || user.has_role?("fetadmin")) if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
can [:show,:index], Calendar can [:show,:index], Calendar
can [:edit, :update,:new,:create,:verwalten], Calendar can [:edit, :update,:new,:create,:verwalten], Calendar
can [:edit, :update,:new,:create,:verwalten,:delete], Calentry can [:edit, :update,:new,:create,:verwalten,:delete], Calentry

9
app/models/thema.rb
View File

@@ -30,10 +30,8 @@ include Rails.application.routes.url_helpers
text :text text :text
text :title, :boost=>4.0 text :title, :boost=>4.0
end end
scope :outdated, -> {includes(:translations).where("thema_translations.updated_at<?",2.month.ago).where("thema_translations.locale"=>I18n.t.locale)
}
scope :outdated, -> {includes(:translations).where("thema_translations.updated_at<?",2.month.ago).where("thema_translations.locale"=>I18n.t.locale)
}
translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
def is_outdated? def is_outdated?
unless translation.try(:updated_at).nil? unless translation.try(:updated_at).nil?
@@ -50,7 +48,6 @@ scope :outdated, -> {includes(:translations).where("thema_translations.updated_a
"...." "...."
else else
words[0..100].join(" ")+ " ..." unless words.nil? words[0..100].join(" ")+ " ..." unless words.nil?
end end
end end
@@ -58,8 +55,6 @@ scope :outdated, -> {includes(:translations).where("thema_translations.updated_a
full_url= URI.parse(root_url(:host=>host)) full_url= URI.parse(root_url(:host=>host))
self.text.gsub!(/src="[\.\/]*uploads\/attachment\/datei\/(\d+)\/thumb_big[^"]*"/){|s| full_url.path=Attachment.find($1.to_i).datei.thumb_big.url; 'src="'+full_url.to_s+'"'} self.text.gsub!(/src="[\.\/]*uploads\/attachment\/datei\/(\d+)\/thumb_big[^"]*"/){|s| full_url.path=Attachment.find($1.to_i).datei.thumb_big.url; 'src="'+full_url.to_s+'"'}
self.text.gsub!(/src="[\.\/^"]*uploads\/attachment\/datei\/(\d+)\/[^"]*"/){|s| full_url.path=Attachment.find($1.to_i).datei.url; 'src="'+full_url.to_s+'"'} self.text.gsub!(/src="[\.\/^"]*uploads\/attachment\/datei\/(\d+)\/[^"]*"/){|s| full_url.path=Attachment.find($1.to_i).datei.url; 'src="'+full_url.to_s+'"'}
self.text.gsub!(/href="[^"]*themen\/(\d+)[^"]*"/){|s| full_url.path=thema_path(Thema.find($1.to_i)); 'href="'+full_url.to_s+'"'} self.text.gsub!(/href="[^"]*themen\/(\d+)[^"]*"/){|s| full_url.path=thema_path(Thema.find($1.to_i)); 'href="'+full_url.to_s+'"'}
end end
end end