-
<%= f.select :category_id, DocumentCategory.active.collect {|c| [c.name, c.id]} %>
+
<%= f.select :category_id, DocumentCategory.active.collect {|c| [c.name, c.id]} %>
+
<%= f.check_box :is_public, :style => "margin-left:10px;" %>
+ <%= l(:label_document_public_info) %>
+
<%= f.text_field :title, :required => true, :size => 60 %>
<%= f.text_area :description, :cols => 60, :rows => 15, :class => 'wiki-edit' %>
">
diff --git a/app/views/files/_course_sort_by_attachtypel.html.erb b/app/views/files/_course_sort_by_attachtypel.html.erb
index cda832493..f0f6c8270 100644
--- a/app/views/files/_course_sort_by_attachtypel.html.erb
+++ b/app/views/files/_course_sort_by_attachtypel.html.erb
@@ -28,7 +28,7 @@
<% @containers.each do |container| %>
<% next if container.attachments.empty? -%>
<% container.attachments.each do |file| %>
- <% if file.is_public == 0 && !User.current.member_of?(@project) %>
+ <% if file.is_public == 0 && !User.current.member_of_course?(@course) %>
<% next %>
<% end %>
<% if isTypeOk(file, selAttachType, selContentType) %>
diff --git a/app/views/users/_user_show.html.erb b/app/views/users/_user_show.html.erb
index d6fa541c7..13f08f7ef 100644
--- a/app/views/users/_user_show.html.erb
+++ b/app/views/users/_user_show.html.erb
@@ -33,21 +33,27 @@
<%= image_tag "/images/time_member.png", :class => "img_member_time"%>
- <%= image_tag(url_to_avatar(user), :class => 'avatar') %>
- <%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
-
-
-
-
- <%= render :partial => 'users/user_score', :locals => {:user => user}%>
-
-
-
- <%= l(:label_x_has_fans,:count=>user.watcher_users.count)%>
- <%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
-
+
+
+ |
+ <%= image_tag(url_to_avatar(user), :class => 'avatar') %>
+ |
+
+ <%= link_to_user(user) %>
+ |
+
+
+ <%= render :partial => 'users/user_score', :locals => {:user => user}%>
+
+ |
+
+
+ |
+ <%= l(:label_x_has_fans,:count=>user.watcher_users.count)%>
+ <%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
+ |
+
+
<% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6566564c9..db673c69c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -537,6 +537,7 @@ en:
label_document_new: New document
label_document_plural: Documents
label_document_added: Document added
+ label_document_public_info: "If you don't choose public, only the project's members can see the document."
label_role: Role
label_role_plural: Roles
label_role_new: New role
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 64f4efc1f..593a73aa6 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -538,6 +538,7 @@ zh:
label_document_new: 新建文档
label_document_plural: 文档
label_document_added: 文档已添加
+ label_document_public_info: （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该文档。）
label_role: 角色
label_role_plural: 角色
label_role_new: 新建角色
diff --git a/config/routes.rb b/config/routes.rb
index ea6211570..780c8b77a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -577,7 +577,6 @@ RedmineApp::Application.routes.draw do
end
end
- match 'projects/course', :to => 'courses#course', :as => 'courses_course'
match 'courses/search', :to => 'courses#search'
# add by nwb
# 课程路由设置
diff --git a/db/migrate/20140714021812_add_is_public_to_documents.rb b/db/migrate/20140714021812_add_is_public_to_documents.rb
new file mode 100644
index 000000000..2c21c7d03
--- /dev/null
+++ b/db/migrate/20140714021812_add_is_public_to_documents.rb
@@ -0,0 +1,5 @@
+class AddIsPublicToDocuments < ActiveRecord::Migration
+ def change
+ add_column :documents, :is_public, :integer,:default => 1
+ end
+end
diff --git a/doc/Automated testing documentation.doc b/doc/Automated testing documentation.doc
new file mode 100644
index 000000000..d01506181
Binary files /dev/null and b/doc/Automated testing documentation.doc differ
diff --git a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
index 3875d5c04..e671c3e22 100644
--- a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
+++ b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
@@ -29,7 +29,7 @@ module Redmine
send :include, Redmine::Acts::ActivityProvider::InstanceMethods
end
- options.assert_valid_keys(:type, :permission, :timestamp, :author_key, :find_options, :func)
+ options.assert_valid_keys(:type, :permission, :timestamp, :author_key, :find_options, :func,:is_public)
self.activity_provider_options ||= {}
# One model can provide different event types
@@ -65,6 +65,11 @@ module Redmine
scope = scope.scoped(:conditions => ["#{provider_options[:author_key]} = ?", options[:author].id])
end
+ # add by nwb
+ if options[:is_public] && !provider_options[:is_public].nil?
+ scope = scope.scoped(:conditions => ["#{provider_options[:is_public]} = ?", options[:is_public]])
+ end
+
if options[:limit]
# id and creation time should be in same order in most cases
scope = scope.scoped(:order => "#{table_name}.id DESC", :limit => options[:limit])
diff --git a/lib/plugins/open_id_authentication/test/test_helper.rb b/lib/plugins/open_id_authentication/test/test_helper.rb
index 43216e1ef..cb76ceddc 100644
--- a/lib/plugins/open_id_authentication/test/test_helper.rb
+++ b/lib/plugins/open_id_authentication/test/test_helper.rb
@@ -8,7 +8,7 @@ gem 'actionpack'
require 'action_controller'
gem 'mocha'
-require 'mocha'
+require 'mocha/setup'
gem 'ruby-openid'
require 'openid'
diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb
index b95ae2bc3..2caef48b8 100644
--- a/lib/redmine/activity/fetcher.rb
+++ b/lib/redmine/activity/fetcher.rb
@@ -82,6 +82,8 @@ module Redmine
def events(from = nil, to = nil, options={})
e = []
@options[:limit] = options[:limit]
+ # modify by nwb
+ @options[:is_public] = options[:is_public]
@scope.each do |event_type|
constantized_providers(event_type).each do |provider|
diff --git a/public/images/button/Thumbs.db b/public/images/button/Thumbs.db
index 26c0ae67c..86ca2aed1 100644
Binary files a/public/images/button/Thumbs.db and b/public/images/button/Thumbs.db differ
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index 7562bcf7c..fcb3ce4f8 100644
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -18,7 +18,7 @@
require File.expand_path('../../test_helper', __FILE__)
begin
- require 'mocha'
+ require 'mocha/setup'
rescue
# Won't run some tests
end
diff --git a/test/integration/routing/courses_test.rb b/test/integration/routing/courses_test.rb
new file mode 100644
index 000000000..ee9a8bd0d
--- /dev/null
+++ b/test/integration/routing/courses_test.rb
@@ -0,0 +1,96 @@
+# Redmine - project management software
+# Copyright (C) 2006-2013 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 File.expand_path('../../../test_helper', __FILE__)
+
+class RoutingProjectsTest < ActionController::IntegrationTest
+ def test_courses
+ assert_routing(
+ { :method => 'get', :path => "/courses" },
+ { :controller => 'courses', :action => 'index' }
+ )
+ end
+ def test_courses_search
+ assert_routing(
+ "/courses/search",
+ {controller: 'courses', action: 'search'}
+ )
+ end
+
+ def test_courses_item
+ assert_routing(
+ 'courses/233',
+ {controller: 'courses', action: 'show', id: '233'}
+ )
+ # id eq str
+ assert_routing(
+ 'courses/timestypo',
+ {controller: 'courses', action: 'show', id: 'timestypo'}
+ )
+ end
+
+ def test_course_setting
+ assert_routing(
+ 'courses/233/settings',
+ {controller: 'courses', action: 'settings', id: '233'}
+ )
+ end
+
+ def test_course_homework
+ assert_routing(
+ 'courses/233/homework',
+ {controller: 'courses', action: 'homework', id: '233'}
+ )
+ assert_routing(
+ 'courses/233/new_homework',
+ {controller: 'courses', action: 'new_homework', id: '233'}
+ )
+ end
+
+ def test_course_file
+ assert_routing(
+ 'courses/233/file',
+ {controller: 'courses', action: 'file', id: '233'}
+ )
+ end
+
+ def test_course_feedback
+ assert_routing(
+ 'courses/233/feedback',
+ {controller: 'courses', action: 'feedback', id: '233'}
+ )
+ end
+
+ def test_course_member
+ assert_routing(
+ 'courses/233/member',
+ {controller: 'courses', action: 'member', id: '233'}
+ )
+ end
+
+ def test_course_finish_restart_course
+ assert_routing(
+ {path: 'courses/233/finishcourse', method: :post},
+ {controller: 'courses', action: 'finishcourse', id: '233'}
+ )
+ assert_routing(
+ {path: 'courses/233/restartcourse', method: :post},
+ {controller: 'courses', action: 'restartcourse', id: '233'}
+ )
+ end
+
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8d0666854..9b1a4f158 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,3 +1,55 @@
+require 'rubygems'
+require 'spork'
+#uncomment the following line to use spork with the debugger
+#require 'spork/ext/ruby-debug'
+
+Spork.prefork do
+ # Loading more in this block will cause your tests to run faster. However,
+ # if you change any configuration or code from libraries loaded here, you'll
+ # need to restart spork for it take effect.
+ ENV["RAILS_ENV"] = "test"
+ require File.expand_path('../../config/environment', __FILE__)
+ require 'rails/test_help'
+
+end
+
+Spork.each_run do
+ # This code will be run each time you run your specs.
+
+end
+
+# --- Instructions ---
+# Sort the contents of this file into a Spork.prefork and a Spork.each_run
+# block.
+#
+# The Spork.prefork block is run only once when the spork server is started.
+# You typically want to place most of your (slow) initializer code in here, in
+# particular, require'ing any 3rd-party gems that you don't normally modify
+# during development.
+#
+# The Spork.each_run block is run each time you run your specs. In case you
+# need to load files that tend to change during development, require them here.
+# With Rails, your application modules are loaded automatically, so sometimes
+# this block can remain empty.
+#
+# Note: You can modify files loaded *from* the Spork.each_run block without
+# restarting the spork server. However, this file itself will not be reloaded,
+# so if you change any of the code inside the each_run block, you still need to
+# restart the server. In general, if you have non-trivial code in this file,
+# it's advisable to move it into a separate file so you can easily edit it
+# without restarting spork. (For example, with RSpec, you could move
+# non-trivial code into a file spec/support/my_helper.rb, making sure that the
+# spec/support/* files are require'd from inside the each_run block.)
+#
+# Any code that is left outside the two blocks will be run during preforking
+# *and* during each_run -- that's probably not what you want.
+#
+# These instructions should self-destruct in 10 seconds. If they don't, feel
+# free to delete them.
+
+
+
+
# Redmine - project management software
# Copyright (C) 2006-2013 Jean-Philippe Lang
#
diff --git a/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
index d69da033f..3e3f6ca88 100644
--- a/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
@@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__)
begin
- require 'mocha'
+ require 'mocha/setup'
class BazaarAdapterTest < ActiveSupport::TestCase
REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s
diff --git a/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb
index 6b2a804e0..cddedf871 100644
--- a/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb
@@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__)
begin
- require 'mocha'
+ require 'mocha/setup'
class CvsAdapterTest < ActiveSupport::TestCase
REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s
diff --git a/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb
index 5b689001a..f5a642689 100644
--- a/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb
@@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__)
begin
- require 'mocha'
+ require 'mocha/setup'
class DarcsAdapterTest < ActiveSupport::TestCase
REPOSITORY_PATH = Rails.root.join('tmp/test/darcs_repository').to_s
diff --git a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
index 946ea4bfa..443b900bf 100644
--- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
@@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__)
begin
- require 'mocha'
+ require 'mocha/setup'
class GitAdapterTest < ActiveSupport::TestCase
REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
diff --git a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
index c23e7debd..ee31ff030 100644
--- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
@@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__)
begin
- require 'mocha'
+ require 'mocha/setup'
class MercurialAdapterTest < ActiveSupport::TestCase
HELPERS_DIR = Redmine::Scm::Adapters::MercurialAdapter::HELPERS_DIR
diff --git a/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
index 8bf08f011..dba1a6d43 100644
--- a/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
@@ -18,7 +18,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__)
begin
- require 'mocha'
+ require 'mocha/setup'
class SubversionAdapterTest < ActiveSupport::TestCase