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

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

Browse Source
This commit is contained in:
Thomas Blazek
2013-08-19 23:20:56 +02:00
parent 0df72b9df1 65b0ad8c19
commit dd659cc8bf
7 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/fragen_controller.rb
View File

@@ -27,7 +27,7 @@ class FragenController < ApplicationController
@frage = Frage.new @frage = Frage.new
respond_to do |format| respond_to do |format|
format.html # new.html.erb format.html
format.json { render json: @frage } format.json { render json: @frage }
end end
end end
@@ -44,7 +44,7 @@ class FragenController < ApplicationController
respond_to do |format| respond_to do |format|
if @frage.save if @frage.save
format.html { redirect_to @frage, notice: 'Frage was successfully created.' } format.html { redirect_to @frage.thema, notice: 'Frage was successfully created.' }
format.json { render json: @frage, status: :created, location: @frage } format.json { render json: @frage, status: :created, location: @frage }
else else
format.html { render action: "new" } format.html { render action: "new" }
@@ -76,7 +76,7 @@ class FragenController < ApplicationController
@frage.destroy @frage.destroy
respond_to do |format| respond_to do |format|
format.html { redirect_to fragen_url } format.html { redirect_to @frage.thema }
format.json { head :no_content } format.json { head :no_content }
end end
end end

2
app/models/frage.rb
View File

@@ -1,5 +1,5 @@
class Frage < ActiveRecord::Base class Frage < ActiveRecord::Base
attr_accessible :text, :title attr_accessible :text, :title, :thema_id
belongs_to :thema belongs_to :thema
validates :thema, :presence => true validates :thema, :presence => true

4
app/views/fragen/_form.html.erb
View File

@@ -1,7 +1,9 @@
<%= tinymce_assets %>
<%= semantic_form_for @frage do |f| %> <%= semantic_form_for @frage do |f| %>
<%= f.inputs do %> <%= f.inputs do %>
<%= f.input :title %> <%= f.input :title %>
<%= f.input :text %> <%= f.input :thema %>
<%= f.input :text, :as=>:tinymce_text%>
<% end %> <% end %>
<%= f.actions do %> <%= f.actions do %>

2
app/views/fragen/show.html.erb
View File

@@ -10,4 +10,4 @@
<%= link_to 'Edit', edit_frage_path(@frage) %> | <%= link_to 'Edit', edit_frage_path(@frage) %> |
<%= link_to 'Back', fragen_path %> <%= link_to 'Back', @frage.thema %>

15
app/views/themen/_small.html.erb
View File

@@ -1,3 +1,16 @@
<%= raw(small.text) %> <%= raw(small.text) %>
<br/> <br/>
<%= link_to 'Edit', edit_thema_path(small) %> <%= raw("<b>FAQs:</b>") unless small.fragen.empty? %>
<br/>
<% small.fragen.each do |frage| %>
<p>
<b> <%= frage.title %> </b> <br/>
<%= raw(frage.text) %>
</p>
<br/>
<% end %>
<%= link_to 'Edit', small %>

15
app/views/themen/show.html.erb
View File

@@ -8,3 +8,18 @@
<%= link_to 'Edit', edit_thema_path(@thema) %> | <%= link_to 'Edit', edit_thema_path(@thema) %> |
<%= link_to 'Back', themengruppe_path(@thema.themengruppe) %> <%= link_to 'Back', themengruppe_path(@thema.themengruppe) %>
<h2>FAQs:</h2>
<% @thema.fragen.each do |frage| %>
<p>
<b> <%= frage.title %> </b> <br/>
<%= raw(frage.text) %>
<br/>
<%= link_to 'Edit', edit_frage_path(frage) %> |
<%= link_to 'Destroy',frage, method: :delete, data: { confirm: 'Are you sure?' } %>
</p>
<% end %>
<br/>
<%= link_to 'Neue Frage', new_frage_path %>

1
app/views/themengruppen/show.html.erb
View File

@@ -25,5 +25,6 @@
<br/><br/> <br/><br/>
<%= link_to 'Edit', edit_themengruppe_path(@themengruppe) %> | <%= link_to 'Edit', edit_themengruppe_path(@themengruppe) %> |
<%= link_to 'Back', themengruppen_path %> <%= link_to 'Back', themengruppen_path %>