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

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

Browse Source 
Conflicts:
	app/views/neuigkeiten/_form.html.erb
This commit is contained in:
Andreas Stephanides
2015-05-28 20:16:33 +02:00
parent 7c668809dc eee8248c0f
commit c7e6c5022b
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/home_controller.rb
View File

@@ -1,7 +1,7 @@
class HomeController < ApplicationController class HomeController < ApplicationController
def index def index
@beispiele = Beispiel.last([Beispiel.count, 3].min) @beispiele = Beispiel.last([Beispiel.count, 3].min)
@neuigkeiten = Neuigkeit.recent @neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).limit(10)
if Thema.count>0 if Thema.count>0
t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml") t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml")
@rubriken= Rubrik.accessible_by(current_ability, :show) @rubriken= Rubrik.accessible_by(current_ability, :show)

2
app/models/neuigkeit.rb
View File

@@ -13,7 +13,7 @@
# #
class Neuigkeit < ActiveRecord::Base class Neuigkeit < ActiveRecord::Base
attr_accessible :datum, :text, :title, :rubrik_id, :author_id,:picture, :calentries_attributes attr_accessible :datum, :text, :title, :rubrik_id, :author_id,:picture, :calentries_attributes, :flag_important
belongs_to :author, :class_name =>'User' belongs_to :author, :class_name =>'User'
belongs_to :rubrik, :class_name =>'Rubrik', :foreign_key => "rubrik_id" belongs_to :rubrik, :class_name =>'Rubrik', :foreign_key => "rubrik_id"
has_one :calendar, through: :rubrik has_one :calendar, through: :rubrik

2
app/views/moduls/load_tiss.html.erb
View File

@@ -3,7 +3,7 @@
<%= semantic_fields_for "lvas[#{i}]" do |f| %> <%= semantic_fields_for "lvas[#{i}]" do |f| %>
<%= f.input :lvanr %> <%= f.input :lvanr %>
<%= f.input :sem , :input_html => { "style"=>"width:7em" },:as=>:select, :collection=>["2013S","2013W","2014S","2014W"] %> <%= f.input :sem , :input_html => { "style"=>"width:7em" },:as=>:select, :collection=>["2012S", "2012W","2013S","2013W","2014S","2014W","2015S","2015W"] %>
<% end %> <% end %>
<% end %> <% end %>

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

@@ -1,23 +1,26 @@
<%= tinymce_assets %> <%= tinymce_assets %>
<% trans = (@neuigkeit.translation.id.nil?) %> <% trans = (@neuigkeit.translation.id.nil?) %>
<%= "Diese Neuigkeit ist noch nicht in " + I18n.locale.to_s + "vorhanden!" if trans %> <%= "Diese Neuigkeit ist noch nicht in " + I18n.locale.to_s + "vorhanden!" if trans %>
<div class="container-fluid"> <div class="container-fluid">
<%= semantic_form_for [@neuigkeit.rubrik,@neuigkeit] do |f| %> <%= semantic_form_for [@neuigkeit.rubrik,@neuigkeit] do |f| %>
<%= f.inputs do %> <%= f.inputs do %>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12">
<div class="span6">
<%= f.input :title, :placeholder=> "Titel", :value=> @neuigkeit.translation.title.to_s %> <%= f.input :title, :placeholder=> "Titel", :value=> @neuigkeit.translation.title.to_s %>
</div>
<div class="span6">
<%= f.input :flag_important, :placeholder=> "Titel" %>
</div>
<div class="span12">
<%= f.input :text, :as=> :tinymce_text %> <%= f.input :text, :as=> :tinymce_text %>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span6"> <div class="span6">
<% f.input :datum, :as=> :datepicker %> <% f.input :datum, :as=> :datepicker %>
<%= f.input :rubrik, :as=> :select, :collection=>Rubrik.all %> <%= f.input :rubrik, :as=> :select, :collection=>Rubrik.all %>
<% f.input :flag_important %>
</div> </div>
<div class="span6"> <div class="span6">
<%= f.input :author, :as=> :select %> <%= f.input :author, :as=> :select %>