This commit was manufactured by cvs2svn to create tag
'epfwiki_r1_5_20081021_0316'.
diff --git a/resources/coverage.zip b/resources/coverage.zip
deleted file mode 100644
index 644d243..0000000
--- a/resources/coverage.zip
+++ /dev/null
Binary files differ
diff --git a/source/app/controllers/sites_controller.rb b/source/app/controllers/sites_controller.rb
index 13a654e..05362d3 100644
--- a/source/app/controllers/sites_controller.rb
+++ b/source/app/controllers/sites_controller.rb
@@ -113,7 +113,18 @@
def versions
@site = Site.find(params[:id])
- @version_pages, @versions = paginate :version, :per_page => 25, :order => 'created_on DESC', :conditions => ['wiki_id = ?', @site.id ]
+ logger.debug("params.inspect: #{params.inspect}")
+ @filter = UserVersion.new(params[:filter]) # done is default 'N'
+ @filter.type_filter = 'UserVersion' if @filter.type_filter.blank?
+ logger.debug("@filter: #{@filter.inspect}")
+ case @filter.done + @filter.type_filter
+ when 'NAll': cond = ['wiki_id = ? and done = ?', @site.id, 'N',] # default
+ when 'AllUserVersion': cond = ['wiki_id = ? and type = ?', @site.id, 'UserVersion' ] # all userversions
+ when 'AllAll': cond = ['wiki_id = ?', @site.id] # all versions
+ when 'NUserVersion': cond = ['wiki_id = ? and done = ? and type = ?', @site.id, 'N', 'UserVersion' ] # all todo userversions
+ end
+ logger.debug("cond: #{cond.inspect}")
+ @version_pages, @versions = paginate :version, :per_page => 25, :order => 'created_on DESC', :conditions => cond
render :action => 'description'
end
@@ -125,7 +136,11 @@
def comments
@site = Site.find(params[:id])
- @comment_pages, @comments = paginate :comment, :per_page => 25, :order => 'created_on DESC', :conditions => ['site_id = ?', @site.id ]
+ #logger.debug("params.inspect: #{params.inspect}")
+ @filter = Comment.new(params[:filter]) # done is default 'N'
+ cond = ['site_id = ?', @site.id ]
+ cond = ['site_id = ? and done = ?', @site.id, 'N' ] if @filter.done == 'N'
+ @comment_pages, @comments = paginate :comment, :per_page => 25, :order => 'created_on DESC', :conditions => cond
render :action => 'description'
end
diff --git a/source/app/models/version.rb b/source/app/models/version.rb
index 3a4dfcb..3ee8800 100644
--- a/source/app/models/version.rb
+++ b/source/app/models/version.rb
@@ -29,6 +29,8 @@
has_many :child_versions, :class_name => 'Version', :foreign_key => 'version_id'
has_many :comments
+ attr_accessor :type_filter # used for selection filter
+
# NOTE: it is not possible to use 'update' below, this is reserved by ActiveRecord.
# If you use it, the record won't save
belongs_to :baseline_update, :class_name => 'Update', :foreign_key => 'update_id'
diff --git a/source/app/views/sites/description.rhtml b/source/app/views/sites/description.rhtml
index d9ab119..99c81de 100644
--- a/source/app/views/sites/description.rhtml
+++ b/source/app/views/sites/description.rhtml
@@ -26,17 +26,44 @@
</ol>
</div>
-<%= links_to_pages(@version_pages) if @version_pages %>
-<%= links_to_pages(@comment_pages) if @comment_pages %>
+
+<% if @version_pages %>
+ <%= links_to_pages(@version_pages) %>
+ <p>
+ <form name="filter" method="get">
+ Filter:
+ <%= check_box('filter', 'done', {}, 'N', 'All' )%> Only Todo
+ <%= check_box('filter', 'type_filter', {}, 'UserVersion', 'All' )%> Only User Versions
+ <input type=submit value=OK>
+ </form>
+ </p>
+ <%= render(:partial => 'versions/versions_list') %>
+<% end %>
+
+<% if @comment_pages %>
+ <%= links_to_pages(@comment_pages) %>
+ <p>
+ <form name="filter" method="get">
+ Filter:
+ <%= check_box('filter', 'done', {}, 'N', 'All' )%> Only Todo
+ <input type=submit value=OK>
+ </form>
+ </p>
+ <%= render(:partial => 'comments/comments_list') %>
+<% end %>
+
+
+
<%= links_to_pages(@page_pages) if @page_pages %>
<%= links_to_pages(@upload_pages) if @upload_pages %>
-<% if admin? %><%= links_to_pages(@feedback_pages) if @feedback_pages %><% end %>
-<%= render(:partial => 'versions/versions_list') if @version_pages %>
-<%= render(:partial => 'comments/comments_list') if @comment_pages %>
+
+
+<% if admin? %><%= links_to_pages(@feedback_pages) if @feedback_pages %><% end %>
<%= render(:partial => 'pages/list') if @page_pages %>
<%= render(:partial => 'uploads/list') if @upload_pages %>
<% if admin? %><%= render(:partial => 'feedbacks/list') if @feedback_pages %><% end %>
+
<br>
<br>
<% end %>
diff --git a/source/public/pages/view/.htaccess b/source/public/pages/view/.htaccess
deleted file mode 100644
index 91091a7..0000000
--- a/source/public/pages/view/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-ForceType text/javascript;charset=utf-8
\ No newline at end of file
