Merge branch 'wiki'

This commit is contained in:
Benjamin Meichsner 2009-08-15 17:24:08 +02:00
commit e75a42d509
146 changed files with 6300 additions and 261 deletions

View file

@ -0,0 +1,100 @@
class PagesController < ApplicationController
def index
@page = Page.find_by_permalink "Home"
if @page
render :action => 'show'
else
redirect_to all_pages_path
end
end
def show
@page = Page.find_by_permalink(params[:permalink])
if @page.nil?
redirect_to new_page_path(:title => params[:permalink])
elsif @page.redirect?
flash[:notice] = "Weitergeleitet von #{@page.title} ..."
redirect_to wiki_page_path(Page.find(@page.redirect).permalink)
end
end
def new
@page = Page.new
@page.title = params[:title].gsub("_", " ") if params[:title]
@page.parent = Page.find_by_permalink(params[:parent]) if params[:parent]
respond_to do |format|
format.html # new.html.erb
format.xml { render :xml => @page }
end
end
def edit
@page = Page.find(params[:id])
end
def create
@page = current_user.pages.build(params[:page])
if params[:preview]
render :action => 'new'
else
if @page.save
flash[:notice] = 'Seite wurde angelegt.'
redirect_to(wiki_page_path(@page.permalink))
else
render :action => "new"
end
end
end
def update
@page = Page.find(params[:id])
@page.attributes = params[:page].merge({:user => current_user})
if params[:preview]
@page.attributes = params[:page]
render :action => 'edit'
else
if @page.save
flash[:notice] = 'Seite wurde aktualisiert.'
redirect_to wiki_page_path(@page.permalink)
else
render :action => "edit"
end
end
rescue ActiveRecord::StaleObjectError
flash[:error] = "Achtung, die Seite wurde gerade von jemand anderes bearbeitet. Bitte versuche es erneut."
redirect_to wiki_page_path(@page.permalink)
end
def destroy
@page = Page.find(params[:id])
@page.destroy
respond_to do |format|
format.html { redirect_to(pages_url) }
format.xml { head :ok }
end
end
def all
@pages = Page.all :order => 'created_at', :conditions => {:redirect => nil}
end
def version
@page = Page.find(params[:id])
@version = Page::Version.find_by_page_id_and_lock_version params[:id], params[:version]
end
def revert
@page = Page.find(params[:id])
@page.revert_to!(params[:version].to_i)
redirect_to wiki_page_path(@page.permalink)
end
end

View file

@ -103,8 +103,13 @@ module ApplicationHelper
end
# to set a title for both the h1-tag and the title in the header
def title(page_title)
content_for(:title) { page_title }
def title(page_title, show_title = true)
@content_for_title = page_title.to_s
@show_title = show_title
end
def show_title?
@show_title
end
def tab_is_active?(tab)

View file

@ -0,0 +1,37 @@
module PagesHelper
include WikiCloth
# def build_anchors(body)
# body.gsub(/(<h\d{1}>(.+)<\/h\d{1}>)/) do
# header = $1
# token = $2.downcase.gsub(' ', '-')
# "<a name='#{token}'> </a>#{header}"
# end
# end
def wikified_body(body, title = nil)
WikiCloth.new({:data => body+"\n", :link_handler => Wikilink.new, :params => {:referer => title}}).to_html
end
def link_to_wikipage(page)
link_to page.title, "/wiki/#{page.title}"
end
# def generate_toc(body)
# toc = ""
# body.gsub(/^([=]{1,6})\s*(.*?)\s*(\1)/) do
# number = $1.length - 1
# name = $2
#
# toc << "#" * number + " #{name}\n"
# end
# toc = WikiCloth.new({:data => toc, :link_handler => Wikilink.new}).to_html
#
# toc.gsub(/<li>([^<>\n]*)/) do
# name = $1
# token = name.downcase.gsub(' ', '-')
#
# "<li><a href='##{token}'>#{name}</a>"
# end
# end
end

View file

@ -2,26 +2,26 @@
#
# Table name: articles
#
# id :integer(4) not null, primary key
# id :integer not null, primary key
# name :string(255) default(""), not null
# supplier_id :integer(4) default(0), not null
# article_category_id :integer(4) default(0), not null
# supplier_id :integer default(0), not null
# article_category_id :integer default(0), not null
# unit :string(255) default(""), not null
# note :string(255)
# availability :boolean(1) default(TRUE), not null
# availability :boolean default(TRUE), not null
# manufacturer :string(255)
# origin :string(255)
# shared_updated_on :datetime
# price :decimal(8, 2)
# price :decimal(, )
# tax :float
# deposit :decimal(8, 2) default(0.0)
# unit_quantity :integer(4) default(1), not null
# deposit :decimal(, ) default(0.0)
# unit_quantity :integer default(1), not null
# order_number :string(255)
# created_at :datetime
# updated_at :datetime
# quantity :integer default(0)
# deleted_at :datetime
# type :string(255)
# quantity :integer(4) default(0)
#
class Article < ActiveRecord::Base

View file

@ -2,7 +2,7 @@
#
# Table name: article_categories
#
# id :integer(4) not null, primary key
# id :integer not null, primary key
# name :string(255) default(""), not null
# description :string(255)
#

View file

@ -2,12 +2,12 @@
#
# Table name: article_prices
#
# id :integer(4) not null, primary key
# article_id :integer(4)
# id :integer not null, primary key
# article_id :integer
# price :decimal(8, 2) default(0.0), not null
# tax :decimal(8, 2) default(0.0), not null
# deposit :decimal(8, 2) default(0.0), not null
# unit_quantity :integer(4)
# unit_quantity :integer
# created_at :datetime
#

View file

@ -2,10 +2,10 @@
#
# Table name: assignments
#
# id :integer(4) not null, primary key
# user_id :integer(4) default(0), not null
# task_id :integer(4) default(0), not null
# accepted :boolean(1)
# id :integer not null, primary key
# user_id :integer default(0), not null
# task_id :integer default(0), not null
# accepted :boolean
#
class Assignment < ActiveRecord::Base

View file

@ -2,8 +2,8 @@
#
# Table name: deliveries
#
# id :integer(4) not null, primary key
# supplier_id :integer(4)
# id :integer not null, primary key
# supplier_id :integer
# delivered_on :date
# created_at :datetime
#

View file

@ -2,11 +2,11 @@
#
# Table name: financial_transactions
#
# id :integer(4) not null, primary key
# ordergroup_id :integer(4) default(0), not null
# id :integer not null, primary key
# ordergroup_id :integer default(0), not null
# amount :decimal(8, 2) default(0.0), not null
# note :text default(""), not null
# user_id :integer(4) default(0), not null
# note :text not null
# user_id :integer default(0), not null
# created_on :datetime not null
#

View file

@ -2,28 +2,27 @@
#
# Table name: groups
#
# id :integer(4) not null, primary key
# id :integer not null, primary key
# type :string(255) default(""), not null
# name :string(255) default(""), not null
# description :string(255)
# account_balance :decimal(8, 2) default(0.0), not null
# account_balance :decimal(, ) default(0.0), not null
# account_updated :datetime
# created_on :datetime not null
# role_admin :boolean(1) not null
# role_suppliers :boolean(1) not null
# role_article_meta :boolean(1) not null
# role_finance :boolean(1) not null
# role_orders :boolean(1) not null
# weekly_task :boolean(1)
# weekday :integer(4)
# role_admin :boolean not null
# role_suppliers :boolean not null
# role_article_meta :boolean not null
# role_finance :boolean not null
# role_orders :boolean not null
# weekly_task :boolean
# weekday :integer
# task_name :string(255)
# task_description :string(255)
# task_required_users :integer(4) default(1)
# task_required_users :integer default(1)
# deleted_at :datetime
# contact_person :string(255)
# contact_phone :string(255)
# contact_address :string(255)
# stats :text
#
# Groups organize the User.

View file

@ -2,13 +2,13 @@
#
# Table name: group_orders
#
# id :integer(4) not null, primary key
# ordergroup_id :integer(4) default(0), not null
# order_id :integer(4) default(0), not null
# id :integer not null, primary key
# ordergroup_id :integer default(0), not null
# order_id :integer default(0), not null
# price :decimal(8, 2) default(0.0), not null
# lock_version :integer(4) default(0), not null
# lock_version :integer default(0), not null
# updated_on :datetime not null
# updated_by_user_id :integer(4)
# updated_by_user_id :integer
#
# A GroupOrder represents an Order placed by an Ordergroup.

View file

@ -2,13 +2,13 @@
#
# Table name: group_order_articles
#
# id :integer(4) not null, primary key
# group_order_id :integer(4) default(0), not null
# order_article_id :integer(4) default(0), not null
# quantity :integer(4) default(0), not null
# tolerance :integer(4) default(0), not null
# id :integer not null, primary key
# group_order_id :integer default(0), not null
# order_article_id :integer default(0), not null
# quantity :integer default(0), not null
# tolerance :integer default(0), not null
# updated_on :datetime not null
# result :decimal(8, 3)
# result :decimal(, )
#
# A GroupOrderArticle stores the sum of how many items of an OrderArticle are ordered as part of a GroupOrder.

View file

@ -2,10 +2,10 @@
#
# Table name: group_order_article_quantities
#
# id :integer(4) not null, primary key
# group_order_article_id :integer(4) default(0), not null
# quantity :integer(4) default(0)
# tolerance :integer(4) default(0)
# id :integer not null, primary key
# group_order_article_id :integer default(0), not null
# quantity :integer default(0)
# tolerance :integer default(0)
# created_on :datetime not null
#

View file

@ -2,11 +2,11 @@
#
# Table name: invites
#
# id :integer(4) not null, primary key
# id :integer not null, primary key
# token :string(255) default(""), not null
# expires_at :datetime not null
# group_id :integer(4) default(0), not null
# user_id :integer(4) default(0), not null
# group_id :integer default(0), not null
# user_id :integer default(0), not null
# email :string(255) default(""), not null
#

View file

@ -2,19 +2,19 @@
#
# Table name: invoices
#
# id :integer(4) not null, primary key
# supplier_id :integer(4)
# delivery_id :integer(4)
# order_id :integer(4)
# id :integer not null, primary key
# supplier_id :integer
# delivery_id :integer
# number :string(255)
# date :date
# paid_on :date
# note :text
# amount :decimal(8, 2) default(0.0), not null
# deposit :decimal(8, 2) default(0.0), not null
# deposit_credit :decimal(8, 2) default(0.0), not null
# created_at :datetime
# updated_at :datetime
# order_id :integer
# deposit :decimal(8, 2) default(0.0), not null
# deposit_credit :decimal(8, 2) default(0.0), not null
#
class Invoice < ActiveRecord::Base

View file

@ -2,9 +2,9 @@
#
# Table name: memberships
#
# id :integer(4) not null, primary key
# group_id :integer(4) default(0), not null
# user_id :integer(4) default(0), not null
# id :integer not null, primary key
# group_id :integer default(0), not null
# user_id :integer default(0), not null
#
class Membership < ActiveRecord::Base

View file

@ -2,13 +2,13 @@
#
# Table name: messages
#
# id :integer(4) not null, primary key
# sender_id :integer(4)
# id :integer not null, primary key
# sender_id :integer
# recipients_ids :text
# subject :string(255) not null
# body :text
# email_state :integer(4) default(0), not null
# private :boolean(1)
# email_state :integer default(0), not null
# private :boolean
# created_at :datetime
#

View file

@ -2,14 +2,14 @@
#
# Table name: orders
#
# id :integer(4) not null, primary key
# supplier_id :integer(4)
# id :integer not null, primary key
# supplier_id :integer
# note :text
# starts :datetime
# ends :datetime
# state :string(255) default("open")
# lock_version :integer(4) default(0), not null
# updated_by_user_id :integer(4)
# lock_version :integer default(0), not null
# updated_by_user_id :integer
# foodcoop_result :decimal(8, 2)
#

View file

@ -2,14 +2,14 @@
#
# Table name: order_articles
#
# id :integer(4) not null, primary key
# order_id :integer(4) default(0), not null
# article_id :integer(4) default(0), not null
# quantity :integer(4) default(0), not null
# tolerance :integer(4) default(0), not null
# units_to_order :integer(4) default(0), not null
# lock_version :integer(4) default(0), not null
# article_price_id :integer(4)
# id :integer not null, primary key
# order_id :integer default(0), not null
# article_id :integer default(0), not null
# quantity :integer default(0), not null
# tolerance :integer default(0), not null
# units_to_order :integer default(0), not null
# lock_version :integer default(0), not null
# article_price_id :integer
#
# An OrderArticle represents a single Article that is part of an Order.

View file

@ -2,9 +2,9 @@
#
# Table name: order_comments
#
# id :integer(4) not null, primary key
# order_id :integer(4)
# user_id :integer(4)
# id :integer not null, primary key
# order_id :integer
# user_id :integer
# text :text
# created_at :datetime
#

View file

@ -2,28 +2,27 @@
#
# Table name: groups
#
# id :integer(4) not null, primary key
# id :integer not null, primary key
# type :string(255) default(""), not null
# name :string(255) default(""), not null
# description :string(255)
# account_balance :decimal(8, 2) default(0.0), not null
# account_balance :decimal(, ) default(0.0), not null
# account_updated :datetime
# created_on :datetime not null
# role_admin :boolean(1) not null
# role_suppliers :boolean(1) not null
# role_article_meta :boolean(1) not null
# role_finance :boolean(1) not null
# role_orders :boolean(1) not null
# weekly_task :boolean(1)
# weekday :integer(4)
# role_admin :boolean not null
# role_suppliers :boolean not null
# role_article_meta :boolean not null
# role_finance :boolean not null
# role_orders :boolean not null
# weekly_task :boolean
# weekday :integer
# task_name :string(255)
# task_description :string(255)
# task_required_users :integer(4) default(1)
# task_required_users :integer default(1)
# deleted_at :datetime
# contact_person :string(255)
# contact_phone :string(255)
# contact_address :string(255)
# stats :text
#
# Ordergroups can order, they are "children" of the class Group

61
app/models/page.rb Normal file
View file

@ -0,0 +1,61 @@
# == Schema Information
#
# Table name: pages
#
# id :integer not null, primary key
# title :string(255)
# body :text
# permalink :string(255)
# lock_version :integer default(0)
# updated_by :integer
# redirect :integer
# created_at :datetime
# updated_at :datetime
#
class Page < ActiveRecord::Base
belongs_to :user, :foreign_key => 'updated_by'
acts_as_versioned :version_column => :lock_version
self.non_versioned_columns += ['permalink', 'created_at', 'title']
acts_as_tree :order => "title"
attr_accessor :old_title # Save title to create redirect page when editing title
validates_presence_of :title, :body
validates_uniqueness_of :permalink, :title
before_validation_on_create :set_permalink
before_validation_on_update :update_permalink
after_update :create_redirect
def self.permalink(title)
title.gsub(/[\/\.,;@\s]/, "_").gsub(/[\"\']/, "")
end
def set_permalink
unless title.blank?
self.permalink = Page.count == 0 ? "Home" : Page.permalink(title)
end
end
protected
def update_permalink
if changed.include?("title")
set_permalink
self.old_title = changes["title"].first # Save title for creating redirect
end
end
def create_redirect
unless old_title.blank?
Page.create :redirect => id,
:title => old_title,
:body => "Weiterleitung auf [[#{title}]]..",
:permalink => Page.permalink(old_title),
:updated_by => updated_by
end
end
end

View file

@ -2,26 +2,26 @@
#
# Table name: articles
#
# id :integer(4) not null, primary key
# id :integer not null, primary key
# name :string(255) default(""), not null
# supplier_id :integer(4) default(0), not null
# article_category_id :integer(4) default(0), not null
# supplier_id :integer default(0), not null
# article_category_id :integer default(0), not null
# unit :string(255) default(""), not null
# note :string(255)
# availability :boolean(1) default(TRUE), not null
# availability :boolean default(TRUE), not null
# manufacturer :string(255)
# origin :string(255)
# shared_updated_on :datetime
# price :decimal(8, 2)
# price :decimal(, )
# tax :float
# deposit :decimal(8, 2) default(0.0)
# unit_quantity :integer(4) default(1), not null
# deposit :decimal(, ) default(0.0)
# unit_quantity :integer default(1), not null
# order_number :string(255)
# created_at :datetime
# updated_at :datetime
# quantity :integer default(0)
# deleted_at :datetime
# type :string(255)
# quantity :integer(4) default(0)
#
class StockArticle < Article

View file

@ -2,13 +2,13 @@
#
# Table name: stock_changes
#
# id :integer(4) not null, primary key
# delivery_id :integer(4)
# order_id :integer(4)
# stock_article_id :integer(4)
# quantity :integer(4) default(0)
# id :integer not null, primary key
# delivery_id :integer
# order_id :integer
# stock_article_id :integer
# quantity :integer default(0)
# created_at :datetime
# stock_taking_id :integer(4)
# stock_taking_id :integer
#
class StockChange < ActiveRecord::Base

View file

@ -2,7 +2,7 @@
#
# Table name: stock_takings
#
# id :integer(4) not null, primary key
# id :integer not null, primary key
# date :date
# note :text
# created_at :datetime

View file

@ -2,7 +2,7 @@
#
# Table name: suppliers
#
# id :integer(4) not null, primary key
# id :integer not null, primary key
# name :string(255) default(""), not null
# address :string(255) default(""), not null
# phone :string(255) default(""), not null
@ -15,7 +15,7 @@
# delivery_days :string(255)
# order_howto :string(255)
# note :string(255)
# shared_supplier_id :integer(4)
# shared_supplier_id :integer
# min_order_quantity :string(255)
# deleted_at :datetime
#

View file

@ -2,16 +2,16 @@
#
# Table name: tasks
#
# id :integer(4) not null, primary key
# id :integer not null, primary key
# name :string(255) default(""), not null
# description :string(255)
# due_date :date
# done :boolean(1)
# workgroup_id :integer(4)
# assigned :boolean(1)
# done :boolean
# workgroup_id :integer
# assigned :boolean
# created_on :datetime not null
# updated_on :datetime not null
# required_users :integer(4) default(1)
# required_users :integer default(1)
#
class Task < ActiveRecord::Base

View file

@ -2,7 +2,7 @@
#
# Table name: users
#
# id :integer(4) not null, primary key
# id :integer not null, primary key
# nick :string(255) default(""), not null
# password_hash :string(255) default(""), not null
# password_salt :string(255) default(""), not null
@ -28,6 +28,7 @@ class User < ActiveRecord::Base
has_many :assignments, :dependent => :destroy
has_many :tasks, :through => :assignments
has_many :send_messages, :class_name => "Message", :foreign_key => "sender_id"
has_many :pages, :foreign_key => 'updated_by'
attr_accessor :password, :setting_attributes

View file

@ -2,28 +2,27 @@
#
# Table name: groups
#
# id :integer(4) not null, primary key
# id :integer not null, primary key
# type :string(255) default(""), not null
# name :string(255) default(""), not null
# description :string(255)
# account_balance :decimal(8, 2) default(0.0), not null
# account_balance :decimal(, ) default(0.0), not null
# account_updated :datetime
# created_on :datetime not null
# role_admin :boolean(1) not null
# role_suppliers :boolean(1) not null
# role_article_meta :boolean(1) not null
# role_finance :boolean(1) not null
# role_orders :boolean(1) not null
# weekly_task :boolean(1)
# weekday :integer(4)
# role_admin :boolean not null
# role_suppliers :boolean not null
# role_article_meta :boolean not null
# role_finance :boolean not null
# role_orders :boolean not null
# weekly_task :boolean
# weekday :integer
# task_name :string(255)
# task_description :string(255)
# task_required_users :integer(4) default(1)
# task_required_users :integer default(1)
# deleted_at :datetime
# contact_person :string(255)
# contact_phone :string(255)
# contact_address :string(255)
# stats :text
#
class Workgroup < Group

View file

@ -18,6 +18,12 @@
{ :name => "Aufgaben", :url => "/tasks"}
]
},
{ :name => "Wiki", :url => "/wiki", :active => ["pages", "wiki"],
:subnav => [
{ :name => "Startseite", :url => "/wiki" },
{ :name => "Alle Seiten", :url => "/pages/all" }
]
},
{ :name => "Bestellungen", :url => u.ordergroup ? "/ordering/" : "/orders",
:active => ["orders", "ordering"],
:subnav => [

View file

@ -30,7 +30,7 @@
- if flash[:error]
%h3.error#flashError= flash[:error]
#loader{:style => "display:none;"}= image_tag("loader.gif", :border => 0)
- if yield(:title)
- if show_title?
%h1= yield(:title)
= yield
#ajax_box(style="display:none")

View file

@ -0,0 +1,5 @@
- content = wikified_body @page.body, @page.title
//#toc
//%h2 Inhaltsverzeichnis
//= generate_toc @page.body
#wiki_content= content

View file

@ -0,0 +1,100 @@
- if params[:preview]
%h2 Vorschau
#preview= render :partial => 'body'
#wiki-syntax-help
%p
.box_title
%h2 Schnelle Formatierungshilfe
.column_content
%table(frame="void")
%tbody
%tr
%td(colspan=2)
%b Zeichenformatierung
%tr
%td
%i kursiv
%td
%pre
''kursiv''<br />
%tr
%td
%b fett
%td
%pre '''Fett'''<br />
%tr
%td
Keine Wiki-<br/>Formatierung
%td
%pre &lt;nowiki&gt;text&lt;/nowiki&gt;
%tr
%td(colspan=2)
%b Block-Formatierung
%tr
%td
Überschriften
%td
%pre
\== Ebene 1 ==
%pre
\=== Ebene 2 ===
%pre
\==== Ebene 3 ====
%tr
%td
Listen mit Punkten
%td
%pre
* Erster Punkt
%pre
** Zweiter Punkt
%tr
%td
Listen mit Zahlen
%td
%pre
1. Ersten Punkt
%pre
1. Zweiter Punkt
%tr
%td(colspan=2)
%b Link-Formatierung
%tr
%td
Wiki-Links
%td
%pre
[[Foodsoft Wiki Seite]]
%tr
%td
Externe Links
%td
%pre
[http://addresse.net Externe Seite]
%tr
%td(colspan=2)
%b Tabellenformatierung
%tr
%td
Siehe
= link_to "Tabellen", "http://www.mediawiki.org/wiki/Help:Tables", :target => '_blank'
- form_for @page do |f|
= f.error_messages
= f.hidden_field :lock_version
= f.hidden_field :parent_id
%p
%b Titel
%br/
= f.text_field :title
%p
%b Inhalt
%br/
= f.text_area :body, :size => "60x30"
%p
= f.submit "Vorschau", :name => 'preview'
|
= f.submit "Speichern"
|
= link_to "Abbrechen", :back

View file

@ -0,0 +1,12 @@
- title "Alle Wikiseiten"
%p= link_to "Neue Seite anlegen", new_page_path
%table
%tr
%th Titel
%th zuletzt aktualisiert
- for page in @pages
%tr
%td= link_to page.title, wiki_page_path(page.permalink)
%td= format_date page.updated_at

View file

@ -0,0 +1,3 @@
- title "#{@page.title} bearbeiten"
= render :partial => 'form'

View file

@ -0,0 +1,3 @@
- title "Neue Wikiseite anlegen"
= render :partial => 'form'

View file

@ -0,0 +1,36 @@
- title @page.title, false
%h1
%span#breadcrump
- for page in @page.ancestors.reverse
= link_to_wikipage(page)
&gt;&gt;
= @page.title
#sidebar
#page-versions
= link_to "Bearbeiten", edit_page_path(@page)
= link_to_function "Versionen (#{@page.versions.count})", "Element.toggle('versions')"
#versions{:style => "display:none"}
%ul
- for version in @page.versions.reverse
%li
= link_to I18n.l(version.updated_at, :format => "%d.%m.%y %H:%M"), version_page_path(@page, :version => version.lock_version)
= "(#{User.find(version.updated_by).nick})"
- unless @page.children.empty?
#subpages
%h2 Unterseiten
%ul
- for page in @page.children
%li= link_to_wikipage(page)
= render :partial => 'body'
%hr.clear/
%p
= link_to "Seite bearbeiten", edit_page_path(@page)
|
= link_to "Seite löschen", @page, :method => :delete, :confirm => "Achtung, auch alle Unterseiten werden gelöscht. Bist Du sicher?"
|
= "Zuletzt bearbeitet am #{format_datetime @page.updated_at} (#{@page.user.nick})"

View file

@ -0,0 +1,11 @@
- title @page.title
#sidebar
%b= "Version vom #{format_datetime @version.updated_at}"
%ul
%li= "Autor: #{User.find(@version.updated_by).nick}"
%li= link_to "Aktuelle Version sehen", wiki_page_path(:permalink => @page.permalink)
%li= link_to "Auf diese Version zurücksetzen", revert_page_path(@page, :version => @version.lock_version)
= wikified_body @version.body