wiki branch merged into trunk

git-svn-id: http://redmine.rubyforge.org/svn/trunk@323 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 138 insertions, 0 deletions

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 91cf074e6..c0b24902c 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -32,6 +32,10 @@ class ApplicationController < ActionController::Base
     end

   end

   

+  def logged_in_user_membership

+    @user_membership ||= Member.find(:first, :conditions => ["user_id=? and project_id=?", self.logged_in_user.id, @project.id])

+  end

+  

   # check if login is globally required to access the application

   def check_if_login_required

     require_login if Setting.login_required?

@@ -89,6 +93,16 @@ class ApplicationController < ActionController::Base
     render :nothing => true, :status => 403

     false

   end

+  

+  # make sure that the user is a member of the project (or admin) if project is private

+  # used as a before_filter for actions that do not require any particular permission on the project

+  def check_project_privacy

+    return true if @project.is_public?

+    return false unless logged_in_user

+    return true if logged_in_user.admin? || logged_in_user_membership

+    render :nothing => true, :status => 403

+    false

+  end

 

   # store current uri in session.
   # return to this location by calling redirect_back_or_default
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 4a957a9cb..69d775c11 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -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)
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
new file mode 100644
index 000000000..88c5b4e4a
--- /dev/null
+++ b/app/controllers/wiki_controller.rb
@@ -0,0 +1,111 @@
+# 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, :check_project_privacy, :except => [:preview]
+    
+  # 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)
+    if params[:export] == 'html'
+      export = render_to_string :action => 'export', :layout => false
+      send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
+      return
+    elsif params[:export] == 'txt'
+      send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
+      return
+    end
+    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.text = "h1. #{@page.pretty_title}" if @content.text.empty?
+    # don't keep previous comment
+    @content.comment = nil
+    if request.post?      
+      if @content.text == params[:content][:text]
+        # don't save if text wasn't changed
+        redirect_to :action => 'index', :id => @project, :page => @page.title
+        return
+      end
+      @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
+    # show pages index, sorted by title
+    when 'page_index'
+      # eager 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'
+    # export wiki to a single html file
+    when 'export'
+      @pages = @wiki.pages.find :all, :order => 'title'
+      export = render_to_string :action => 'export_multiple', :layout => false
+      send_data(export, :type => 'text/html', :filename => "wiki.html")
+      return      
+    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
+  
+  def preview
+    @text = params[:content][:text]
+    render :partial => 'preview'
+  end
+
+private
+  
+  def find_wiki
+    @project = Project.find(params[:id])
+    @wiki = @project.wiki
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end