wiki initial commit
git-svn-id: http://redmine.rubyforge.org/svn/branches/work@290 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
c32c92bfa9
commit
003960b811
47 files changed
+1876
-4
No files matched your search
@@ -68,6 +68,10 @@ class ProjectsController < ApplicationController
|
||||
@project.repository = Repository.new
|
||||
@project.repository.attributes = params[:repository]
|
||||
end
|
||||
if "1" == params[:wiki_enabled]
|
||||
@project.wiki = Wiki.new
|
||||
@project.wiki.attributes = params[:wiki]
|
||||
end
|
||||
if @project.save
|
||||
flash[:notice] = l(:notice_successful_create)
|
||||
redirect_to :controller => 'admin', :action => 'projects'
|
||||
@@ -113,6 +117,15 @@ class ProjectsController < ApplicationController
|
||||
@project.repository.update_attributes params[:repository]
|
||||
end
|
||||
end
|
||||
if params[:wiki_enabled]
|
||||
case params[:wiki_enabled]
|
||||
when "0"
|
||||
@project.wiki.destroy
|
||||
when "1"
|
||||
@project.wiki ||= Wiki.new
|
||||
@project.wiki.update_attributes params[:wiki]
|
||||
end
|
||||
end
|
||||
@project.attributes = params[:project]
|
||||
if @project.save
|
||||
flash[:notice] = l(:notice_successful_update)
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
# redMine - project management software
|
||||
# Copyright (C) 2006-2007 Jean-Philippe Lang
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
class WikiController < ApplicationController
|
||||
layout 'base'
|
||||
before_filter :find_wiki
|
||||
|
||||
# display a page (in editing mode if it doesn't exist)
|
||||
def index
|
||||
page_title = params[:page]
|
||||
@page = @wiki.find_or_new_page(page_title)
|
||||
if @page.new_record?
|
||||
edit
|
||||
render :action => 'edit' and return
|
||||
end
|
||||
@content = (params[:version] ? @page.content.versions.find_by_version(params[:version]) : @page.content)
|
||||
render :action => 'show'
|
||||
end
|
||||
|
||||
# edit an existing page or a new one
|
||||
def edit
|
||||
@page = @wiki.find_or_new_page(params[:page])
|
||||
@page.content = WikiContent.new(:page => @page) if @page.new_record?
|
||||
@content = @page.content
|
||||
@content.comment = nil
|
||||
if request.post?
|
||||
@content.text = params[:content][:text]
|
||||
@content.comment = params[:content][:comment]
|
||||
@content.author = logged_in_user
|
||||
# if page is new @page.save will also save content, but not if page isn't a new record
|
||||
if (@page.new_record? ? @page.save : @content.save)
|
||||
redirect_to :action => 'index', :id => @project, :page => @page.title
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# show page history
|
||||
def history
|
||||
@page = @wiki.find_page(params[:page])
|
||||
# don't load text
|
||||
@versions = @page.content.versions.find :all,
|
||||
:select => "id, author_id, comment, updated_on, version",
|
||||
:order => 'version DESC'
|
||||
end
|
||||
|
||||
# display special pages
|
||||
def special
|
||||
page_title = params[:page].downcase
|
||||
case page_title
|
||||
when 'page_index'
|
||||
# eagger load information about last updates, without loading text
|
||||
@pages = @wiki.pages.find :all, :select => "wiki_pages.*, wiki_contents.updated_on",
|
||||
:joins => "LEFT JOIN wiki_contents ON wiki_contents.page_id = wiki_pages.id",
|
||||
:order => 'title'
|
||||
else
|
||||
# requested special page doesn't exist, redirect to default page
|
||||
redirect_to :action => 'index', :id => @project, :page => nil and return
|
||||
end
|
||||
render :action => "special_#{page_title}"
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def find_wiki
|
||||
@project = Project.find(params[:id])
|
||||
@wiki = @project.wiki
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
render_404
|
||||
end
|
||||
end
|
||||
@@ -63,7 +63,7 @@ module ApplicationHelper
|
||||
end
|
||||
|
||||
def format_time(time)
|
||||
l_datetime(time) if time
|
||||
l_datetime((time.is_a? String) ? time.to_time : time) if time
|
||||
end
|
||||
|
||||
def day_name(day)
|
||||
@@ -93,7 +93,9 @@ module ApplicationHelper
|
||||
end
|
||||
|
||||
def textilizable(text)
|
||||
text = (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize") ? RedCloth.new(h(text)).to_html : simple_format(auto_link(h(text)))
|
||||
# turn wiki links in textile links: "text":url
|
||||
text = text.gsub(/\[\[([^\]]+)\]\]/) {|m| "\"#{$1}\":/wiki/#{@project.id}/#{Wiki.titleize($1)}" } if @project
|
||||
text = (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize") ? auto_link(RedCloth.new(text, [:filter_html]).to_html) : simple_format(auto_link(h(text)))
|
||||
# turn "#id" patterns into links to issues
|
||||
text = text.gsub(/#(\d+)([^;\d])/, "<a href='/issues/show/\\1'>#\\1</a>\\2")
|
||||
end
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
# redMine - project management software
|
||||
# Copyright (C) 2006-2007 Jean-Philippe Lang
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
module WikiHelper
|
||||
end
|
||||
@@ -26,13 +26,14 @@ class Project < ActiveRecord::Base
|
||||
has_many :news, :dependent => :delete_all, :include => :author
|
||||
has_many :issue_categories, :dependent => :delete_all, :order => "issue_categories.name"
|
||||
has_one :repository, :dependent => :destroy
|
||||
has_one :wiki, :dependent => :destroy
|
||||
has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => 'custom_fields_projects', :association_foreign_key => 'custom_field_id'
|
||||
acts_as_tree :order => "name", :counter_cache => true
|
||||
|
||||
validates_presence_of :name, :description
|
||||
validates_uniqueness_of :name
|
||||
validates_associated :custom_values, :on => :update
|
||||
validates_associated :repository
|
||||
validates_associated :repository, :wiki
|
||||
validates_format_of :name, :with => /^[\w\s\'\-]*$/i
|
||||
|
||||
# returns latest created projects
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
# redMine - project management software
|
||||
# Copyright (C) 2006-2007 Jean-Philippe Lang
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
class Wiki < ActiveRecord::Base
|
||||
belongs_to :project
|
||||
has_many :pages, :class_name => 'WikiPage', :dependent => :destroy
|
||||
|
||||
validates_presence_of :project_id, :start_page
|
||||
|
||||
# find the page with the given title
|
||||
# if page doesn't exist, return a new page
|
||||
def find_or_new_page(title)
|
||||
title = Wiki.titleize(title || start_page)
|
||||
find_page(title) || WikiPage.new(:wiki => self, :title => title)
|
||||
end
|
||||
|
||||
# find the page with the given title
|
||||
def find_page(title)
|
||||
pages.find_by_title(Wiki.titleize(title || start_page))
|
||||
end
|
||||
|
||||
# turn a string into a valid page title
|
||||
def self.titleize(title)
|
||||
# replace spaces with _ and remove unwanted caracters
|
||||
title = title.gsub(/\s+/, '_').delete(',;') if title
|
||||
# upcase the first letter
|
||||
title = title[0..0].upcase + title[1..-1] if title
|
||||
title
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,52 @@
|
||||
# redMine - project management software
|
||||
# Copyright (C) 2006-2007 Jean-Philippe Lang
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
require 'zlib'
|
||||
|
||||
class WikiContent < ActiveRecord::Base
|
||||
belongs_to :page, :class_name => 'WikiPage', :foreign_key => 'page_id'
|
||||
belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
|
||||
validates_presence_of :text
|
||||
|
||||
acts_as_versioned
|
||||
class Version
|
||||
belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
|
||||
attr_protected :data
|
||||
|
||||
def text=(plain)
|
||||
gz = Zlib::GzipWriter.new(compressed = StringIO.new)
|
||||
gz.write(plain)
|
||||
gz.close
|
||||
self.data = compressed.string
|
||||
self.compression = 'gzip'
|
||||
end
|
||||
|
||||
def text
|
||||
case compression
|
||||
when 'gzip'
|
||||
gz = Zlib::GzipReader.new(StringIO.new(data))
|
||||
plain = gz.read
|
||||
gz.close
|
||||
plain
|
||||
else
|
||||
# uncompressed data
|
||||
data
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
@@ -0,0 +1,34 @@
|
||||
# redMine - project management software
|
||||
# Copyright (C) 2006-2007 Jean-Philippe Lang
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
class WikiPage < ActiveRecord::Base
|
||||
belongs_to :wiki
|
||||
has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
|
||||
|
||||
validates_presence_of :title
|
||||
validates_format_of :title, :with => /^[^,\s]*$/
|
||||
validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
|
||||
validates_associated :content
|
||||
|
||||
def before_save
|
||||
self.title = Wiki.titleize(title)
|
||||
end
|
||||
|
||||
def pretty_title
|
||||
title.tr '_', ' '
|
||||
end
|
||||
end
|
||||
@@ -91,6 +91,7 @@
|
||||
<%= link_to l(:label_change_log), {:controller => 'projects', :action => 'changelog', :id => @project }, :class => "menuItem" %>
|
||||
<%= link_to l(:label_roadmap), {:controller => 'projects', :action => 'roadmap', :id => @project }, :class => "menuItem" %>
|
||||
<%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %>
|
||||
<%= link_to l(:label_wiki), {:controller => 'wiki', :id => @project, :page => nil }, :class => "menuItem" if @project.wiki and !@project.wiki.new_record? %>
|
||||
<%= link_to l(:label_member_plural), {:controller => 'projects', :action => 'list_members', :id => @project }, :class => "menuItem" %>
|
||||
<%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %>
|
||||
<%= link_to l(:label_search), {:controller => 'projects', :action => 'search', :id => @project }, :class => "menuItem" %>
|
||||
@@ -115,6 +116,7 @@
|
||||
<li><%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %></li>
|
||||
<li><%= link_to l(:label_roadmap), :controller => 'projects', :action => 'roadmap', :id => @project %></li>
|
||||
<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
|
||||
<li><%= link_to l(:label_wiki), :controller => 'wiki', :id => @project, :page => nil if @project.wiki and !@project.wiki.new_record? %></li>
|
||||
<li><%= link_to l(:label_member_plural), :controller => 'projects', :action => 'list_members', :id => @project %></li>
|
||||
<li><%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %></li>
|
||||
<li><%= link_to l(:label_search), :controller => 'projects', :action => 'search', :id => @project %></li>
|
||||
|
||||
@@ -36,6 +36,17 @@
|
||||
<%= javascript_tag "Element.hide('repository');" if @project.repository.nil? %>
|
||||
</div>
|
||||
|
||||
<div class="box">
|
||||
<h3><%= check_box_tag "wiki_enabled", 1, !@project.wiki.nil?, :onclick => "Element.toggle('wiki');" %> <%= l(:label_wiki) %></h3>
|
||||
<%= hidden_field_tag "wiki_enabled", 0 %>
|
||||
<div id="wiki">
|
||||
<% fields_for :wiki, @project.wiki, { :builder => TabularFormBuilder, :lang => current_language} do |wiki| %>
|
||||
<p><%= wiki.text_field :start_page, :size => 60, :required => true %></p>
|
||||
<% end %>
|
||||
</div>
|
||||
<%= javascript_tag "Element.hide('wiki');" if @project.wiki.nil? %>
|
||||
</div>
|
||||
|
||||
<% content_for :header_tags do %>
|
||||
<%= javascript_include_tag 'calendar/calendar' %>
|
||||
<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
<div class="contextual">
|
||||
<%= link_to('Page index', {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
|
||||
</div>
|
||||
|
||||
<h2><%= @page.pretty_title %></h2>
|
||||
|
||||
<% form_for :content, @content, :url => {:action => 'edit', :page => @page.title} do |f| %>
|
||||
<%= error_messages_for 'content' %>
|
||||
<p><%= f.text_area :text, :cols => 100, :rows => 25 %></p>
|
||||
<p><label><%= l(:field_comment) %></label><br /><%= f.text_field :comment, :size => 120 %></p>
|
||||
<p><%= submit_tag l(:button_save) %></p>
|
||||
<% end %>
|
||||
|
||||
<% if Setting.text_formatting == 'textile' %>
|
||||
<%= javascript_include_tag 'jstoolbar' %>
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
if (document.getElementById) {
|
||||
if (document.getElementById('content_text')) {
|
||||
var commentTb = new jsToolBar(document.getElementById('content_text'));
|
||||
commentTb.draw();
|
||||
}
|
||||
}
|
||||
//]]>
|
||||
</script>
|
||||
<% end %>
|
||||
@@ -0,0 +1,13 @@
|
||||
<div class="contextual">
|
||||
<%= link_to('Page index', {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
|
||||
</div>
|
||||
|
||||
<h2><%= @page.pretty_title %></h2>
|
||||
|
||||
<h3><%= l(:label_history) %></h3>
|
||||
|
||||
<p><% @versions.each do |ver| %>
|
||||
<%= link_to "#{ver.version}. #{format_time(ver.updated_on)}", :action => 'index', :page => @page.title, :version => ver.version %> <em>(<%= ver.author ? ver.author.name : "anonyme" %>)</em> <%= ver.comment %><br />
|
||||
<% end %></p>
|
||||
|
||||
<p><%= link_to l(:button_back), :action => 'index', :page => @page.title %></p>
|
||||
@@ -0,0 +1,24 @@
|
||||
<div class="contextual">
|
||||
<%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') if @content.version == @page.content.version %>
|
||||
<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
|
||||
<%= link_to('Page index', {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
|
||||
</div>
|
||||
|
||||
<h2><%= @page.pretty_title %></h2>
|
||||
|
||||
<% if @content.version != @page.content.version %>
|
||||
<div class="box">
|
||||
<div style="float:right;">
|
||||
<%= link_to('Version actuelle', :action => 'index', :page => @page.title) %> (<%= @page.content.version %>)
|
||||
<%= " - " + link_to(('« ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) if @content.version > 1 %>
|
||||
<%= " - " + link_to((l(:label_next) + ' »'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) if @content.version < @page.content.version %>
|
||||
</div>
|
||||
<%= "Version #{@content.version} du #{format_time(@content.updated_on)}" %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div class="wiki">
|
||||
<% cache :action => 'page', :id => @page.id, :ver => @content.version do %>
|
||||
<%= textilizable @content.text %>
|
||||
<% end %>
|
||||
</div>
|
||||
@@ -0,0 +1,7 @@
|
||||
<h2>Page index</h2>
|
||||
|
||||
<% if @pages.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
|
||||
<ul><% @pages.each do |page| %>
|
||||
<li><%= link_to page.pretty_title, :action => 'index', :page => page.title %> -
|
||||
<%= l(:label_last_updates) %>: <%= format_time(page.updated_on) %></li>
|
||||
<% end %></ul>
|
||||
Reference in new issue
Block a user