diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 297dbd8..058b5f0 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,7 +1,7 @@ class HomeController < ApplicationController def index @beispiele = Beispiel.last([Beispiel.count, 3].min) - @neuigkeiten = Neuigkeit.recent + @neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).limit(10) if Thema.count>0 t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml") @rubriken= Rubrik.accessible_by(current_ability, :show) diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb index c338d41..4880330 100755 --- a/app/models/neuigkeit.rb +++ b/app/models/neuigkeit.rb @@ -13,7 +13,7 @@ # 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 :rubrik, :class_name =>'Rubrik', :foreign_key => "rubrik_id" has_one :calendar, through: :rubrik diff --git a/app/views/moduls/load_tiss.html.erb b/app/views/moduls/load_tiss.html.erb index 0216903..93a5df0 100644 --- a/app/views/moduls/load_tiss.html.erb +++ b/app/views/moduls/load_tiss.html.erb @@ -3,7 +3,7 @@ <%= semantic_fields_for "lvas[#{i}]" do |f| %> <%= 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 %> diff --git a/app/views/neuigkeiten/_form.html.erb b/app/views/neuigkeiten/_form.html.erb index 76f452f..8d124bd 100755 --- a/app/views/neuigkeiten/_form.html.erb +++ b/app/views/neuigkeiten/_form.html.erb @@ -3,16 +3,21 @@ <%= semantic_form_for [@neuigkeit.rubrik,@neuigkeit] do |f| %> <%= f.inputs do %>
-
- <%= f.input :title, :placeholder=> "Titel" %> - <%= f.input :text, :as=> :tinymce_text %> -
+
+ <%= f.input :title, :placeholder=> "Titel" %> +
+
+ <%= f.input :flag_important, :placeholder=> "Titel" %> +
+
+ <%= f.input :text, :as=> :tinymce_text %> +
<% f.input :datum, :as=> :datepicker %> <%= f.input :rubrik, :as=> :radio, :collection=>Rubrik.all %> - <% f.input :flag_important %> + <%= f.input :flag_important %>
<%= f.input :author, :as=> :select %>