andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

profile form fixed, themen isdraft

Browse Source
This commit is contained in:
Andreas Stephanides
2014-06-24 16:32:00 +05:30
parent a86d7482f1
commit 2ba920331a
9 changed files with 36 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/thema.rb
View File

@@ -12,7 +12,7 @@
require 'uri'
class Thema < ActiveRecord::Base
include Rails.application.routes.url_helpers
attr_accessible :text, :title, :themengruppe_id
attr_accessible :text, :title, :themengruppe_id,:isdraft, :hidelink, :hideattachment
has_many :fragen
has_many :attachments
belongs_to :themengruppe, :foreign_key => "themengruppe_id"
@@ -22,7 +22,11 @@ include Rails.application.routes.url_helpers
validates :title, :presence => true
validates :text, :presence => true
scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")}
scope :outdated, -> {where("updated_at < ?", 1.week.ago)}
translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
def is_outdated?
updated_at < 1.week.ago
end
def is_wiki?
!(wikiname.nil? || wikiname.empty?)
end

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

@@ -68,7 +68,7 @@
<div class="span12">
<%= f.actions do %>
<%= f.action :submit, :as => :input , :label=>I18n.t("common.save") %>
<%= f.action :submit, :as => :input, :button_html=>{value: "continue"} , :label=>I18n.t("common.savecont") %>
<%= f.action :submit, :as => :input , :label=>I18n.t("common.savecont"), :button_html=>{value: "continue"} %>
<%= f.action :cancel, :as=> :link , :label=>I18n.t("common.cancel") %>
<% end %>
</div>

12
app/views/memberships/_form.html.erb
View File

@@ -1,12 +0,0 @@
<%= semantic_form_for [@membership.fetprofile,@membership] do |f| %>
<%= f.inputs do %>
<%= f.input :gremium, :as=>:radio %>
<%= f.input :start %>
<%= f.input :stop %>
<%= f.input :typ ,:as=>:radio,:collection=>Membership::TYPEN.invert %>
<% end %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<% end %>
<% end %>

6
app/views/memberships/edit.html.erb
View File

@@ -1,6 +0,0 @@
<h1>Editing membership</h1>
<%= render 'form' %>
<%= link_to 'Show', @membership %> |
<%= link_to 'Back', memberships_path %>

31
app/views/memberships/index.html.erb
View File

@@ -1,31 +0,0 @@
<h1>Listing memberships</h1>
<table>
<tr>
<th>Fetprofile</th>
<th>Gremium</th>
<th>Start</th>
<th>Stop</th>
<th>Typ</th>
<th></th>
<th></th>
<th></th>
</tr>
<% @memberships.each do |membership| %>
<tr>
<td><%= membership.fetprofile_id %></td>
<td><%= membership.gremium_id %></td>
<td><%= membership.start %></td>
<td><%= membership.stop %></td>
<td><%= membership.typ %></td>
<td><%= link_to 'Show', membership %></td>
<td><%= link_to 'Edit', edit_membership_path(membership) %></td>
<td><%= link_to 'Destroy', membership, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</table>
<br />
<%= link_to 'New Membership', new_membership_path %>

5
app/views/memberships/new.html.erb
View File

@@ -1,5 +0,0 @@
<h1>New membership</h1>
<%= render 'form' %>
<%= link_to 'Back', @membership.fetprofile %>

30
app/views/memberships/show.html.erb
View File

@@ -1,30 +0,0 @@
<p id="notice"><%= notice %></p>
<p>
<b>Fetprofile:</b>
<%= @membership.fetprofile_id %>
</p>
<p>
<b>Gremium:</b>
<%= @membership.gremium_id %>
</p>
<p>
<b>Start:</b>
<%= @membership.start %>
</p>
<p>
<b>Stop:</b>
<%= @membership.stop %>
</p>
<p>
<b>Typ:</b>
<%= @membership.typ %>
</p>
<%= link_to 'Edit', edit_membership_path(@membership) %> |
<%= link_to 'Back', memberships_path %>

22
app/views/themen/_form.html.erb
View File

@@ -10,13 +10,31 @@
<div class="span6">
<%= f.input :themengruppe %>
</div>
</div>
<div class="row-fluid">
<div class="span4">
<%= f.input :isdraft %>
</div>
<div class="span4">
<%= f.input :hidelink, :as=>:boolean %>
</div>
<div class="span4">
<%= f.input :hideattachment %>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<%= f.input :text, :as=>:tinymce_text,:label=>false, :input_html=>{:rows=>20} %>
</div>
</div>
</div>
</div>
<% unless I18n.locale == :de %>
@thema.text
<% end %>
<%= f.actions do %>
<%= f.action :submit, :as => :button, :label=> I18n.t("thema.save" ) %>
<%= f.action :submit, :as => :button, :label=> I18n.t("thema.savecont"), :button_html=>{:value=>"continue"} %>

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

@@ -1,6 +1,13 @@
<a name="thema_<%=small.id%>" href="#<%=small.id%>">
<h2><%= small.title %> <%= link_to fa_icon("pencil"), verwalten_thema_path(small) if can? :edit, small %></h2>
</a>
<% if small.is_outdated? %>
<div style="background:red; width:100%"> Outdated </div>
<% end %>
<% if small.isdraft %>
<div style="background:yellow; width:100%"> isdraft </div>
<% end %>
<%= raw(small.text) %>
<br/>