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

AutoCommit Fre Jul 10 12:03:14 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-07-10 12:03:14 +02:00
parent 5d9571b03a
commit 5b09d51365
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@@ -54,6 +54,7 @@ gem "tinymce-rails" , '~>4.1.0'
#gem "globalize3" ,'~>3.0.4' #gem "globalize3" ,'~>3.0.4'
gem "globalize" ,'~>3.0.4'#,:git =>'git://github.com/globalize/globalize.git' gem "globalize" ,'~>3.0.4'#,:git =>'git://github.com/globalize/globalize.git'
gem 'globalize-versioning' gem 'globalize-versioning'
gem 'globalize-accessors'
# Version controll # Version controll
gem "paper_trail" , '~>3.0.5'#, :git=>'git://github.com/airblade/paper_trail.git' gem "paper_trail" , '~>3.0.5'#, :git=>'git://github.com/airblade/paper_trail.git'

7
app/controllers/beispiele_controller.rb
View File

@@ -5,8 +5,11 @@ class BeispieleController < ApplicationController
include LikeVoteable include LikeVoteable
acts_as_flagable acts_as_flagable
def index def index
@beispiele = Beispiel.all unless params[:lva_id].nil?
@beispiele= Lva.find(params[:lva_id]).beispiele.accessible_by(current_ability, :show)
else
@beispiele = Beispiel.accessible_by(current_ability, :show)
end
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
format.json { render json: @beispiele } format.json { render json: @beispiele }

1
app/models/neuigkeit.rb
View File

@@ -27,6 +27,7 @@ class Neuigkeit < ActiveRecord::Base
validates :rubrik, :presence=>true validates :rubrik, :presence=>true
validates :author, :presence=>true validates :author, :presence=>true
translates :title,:text, :versioning=>{:gem=>:paper_trail, :options=>{:fallbacks_for_empty_translations => true}} translates :title,:text, :versioning=>{:gem=>:paper_trail, :options=>{:fallbacks_for_empty_translations => true}}
globalize_accessors :locales => [:de, :en], :attributes =>[:text,:title]
mount_uploader :picture, PictureUploader mount_uploader :picture, PictureUploader
default_scope order(:cache_order).includes(:calentries).includes(:title_pic) default_scope order(:cache_order).includes(:calentries).includes(:title_pic)

14
app/views/beispiele/_beispiel_list.html.erb
View File

@@ -1,19 +1,13 @@
<div class="beispiel"> <div class="beispiel">
<p>
<b> <b>
<%=link_to beispiel.name, beispiel.beispieldatei.url%> <%=link_to beispiel.name, beispiel.beispieldatei.url%>
</b> </b>
<p>
Beschreibung: <%=link_to beispiel.lva.name, lva_path(beispiel.lva.id) unless beispiel.lva.nil? %>
<p>
<%= beispiel.desc %>
</p>
<p>
LVA: <%=link_to beispiel.lva.name, lva_path(beispiel.lva.id)%>
</p>
<%= link_to 'Show', beispiel %> <%= link_to 'Show', beispiel %>
<%= link_to 'Edit', edit_beispiel_path(beispiel) %> <%= link_to 'Edit', edit_beispiel_path(beispiel) %>
<%= link_to 'Destroy', beispiel, method: :delete, data: { confirm: 'Are you sure?' } %>
</div class="beispiel"> </div class="beispiel">

2
app/views/neuigkeiten/_form.html.erb
View File

@@ -18,7 +18,7 @@
<%= f.input :text, :as=> :tinymce_text %> <%= f.input :text, :as=> :tinymce_text %>
</div> </div>
<div class="span4"> <div class="span4">
<%= if I18n.locale == :en %> <%= @neuigkeit.text_de if I18n.locale == :en %>
</div> </div>
</div> </div>