#
- def show_activity(state)
- content = ''.html_safe
- case state
- when 0
- s = content_tag('span', l(:label_user_all_activity), :class => "current-page")
- content << content_tag('li', s)
- content << content_tag('li', link_to(l(:label_user_activity_myself), {:controller => 'users', :action => 'show', :type => 1}))
- content << content_tag('li', link_to(l(:label_user_all_respond), {:controller => 'users', :action => 'show', :type => 2}))
- when 1
- s = content_tag('span', l(:label_user_activity_myself), :class => "current-page")
- content << content_tag('li', link_to(l(:label_user_all_activity), {:controller => 'users', :action => 'show'}))
- content << content_tag('li', s, :class => "current-page")
- content << content_tag('li', link_to(l(:label_user_all_respond), {:controller => 'users', :action => 'show', :type => 2}))
- when 2
- s = content_tag('span', l(:label_user_all_respond), :class => "current-page")
- content << content_tag('li', link_to(l(:label_user_all_activity), {:controller => 'users', :action => 'show'}))
- content << content_tag('li', link_to(l(:label_user_activity_myself), {:controller => 'users', :action => 'show', :type => 1}))
- content << content_tag('li', s, :class => "current-page")
- end
- content_tag('div', content, :class => "pagination")
- end
+ # TODO: 寰呭垹
+ # def show_activity(state)
+ # content = ''.html_safe
+ # case state
+ # when 0
+ # s = content_tag('span', l(:label_user_all_activity), :class => "current-page")
+ # content << content_tag('li', s)
+ # content << content_tag('li', link_to(l(:label_user_activity_myself), {:controller => 'users', :action => 'show', :type => 1}))
+ # content << content_tag('li', link_to(l(:label_user_all_respond), {:controller => 'users', :action => 'show', :type => 2}))
+ # when 1
+ # s = content_tag('span', l(:label_user_activity_myself), :class => "current-page")
+ # content << content_tag('li', link_to(l(:label_user_all_activity), {:controller => 'users', :action => 'show'}))
+ # content << content_tag('li', s, :class => "current-page")
+ # content << content_tag('li', link_to(l(:label_user_all_respond), {:controller => 'users', :action => 'show', :type => 2}))
+ # when 2
+ # s = content_tag('span', l(:label_user_all_respond), :class => "current-page")
+ # content << content_tag('li', link_to(l(:label_user_all_activity), {:controller => 'users', :action => 'show'}))
+ # content << content_tag('li', link_to(l(:label_user_activity_myself), {:controller => 'users', :action => 'show', :type => 1}))
+ # content << content_tag('li', s, :class => "current-page")
+ # end
+ # content_tag('div', content, :class => "pagination")
+ # end
+ #TODO: 寰呭垹
def watch_projects(state)
content = ''.html_safe
case state
diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index 330010212..c00f629dc 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -237,7 +237,7 @@ module WelcomeHelper
content_tag('span', find_all_event_type(event)) <<
': '.html_safe <<
link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url) <<
- link_to((' ['.html_safe+l(:label_downloads_list).to_s << ']'), project_files_path(event.container), :class => "attachments_list_color")
+ link_to((' ['.html_safe+l(:label_downloads_list).to_s << ']'), project_files_path(event.container.project), :class => "attachments_list_color")
else
str << content_tag("span", "鏇存柊浜") <<
content_tag("span", find_all_event_type(event)) <<
diff --git a/app/models/bug_to_osp.rb b/app/models/bug_to_osp.rb
index 5471bd3f9..9cd1d7359 100644
--- a/app/models/bug_to_osp.rb
+++ b/app/models/bug_to_osp.rb
@@ -5,4 +5,8 @@ class BugToOsp < ActiveRecord::Base
validates_presence_of :osp_id, :relative_memo_id
+ scope :visible, lambda {|*args|
+ nil
+ }
+
end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index d2332350a..7e899eafc 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1156,7 +1156,11 @@ class Issue < ActiveRecord::Base
# back string obj which is belong to project.
def source_from
"" << self.project.name.to_s <<
- "#" << (self.project.issues.index(self).to_i + 1).to_s
+ "#" << project_index
+ end
+
+ def project_index
+ (self.project.issues.index(self).to_i + 1).to_s
end
private
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index e0ad54296..bb7a2424f 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -57,12 +57,16 @@ class Mailer < ActionMailer::Base
#濡傛灉鏄洿鎺ョ暀瑷骞朵笖鐣欒█瀵硅薄鏄疨roject骞朵笖Project绫诲瀷鏄绋
if !journals_for_message.at_user && journals_for_message.jour.class.to_s.to_sym == :Project && journals_for_message.jour.project_type == 1
project = journals_for_message.jour
+ @author = journals_for_message.user
#璇剧▼鐨勬暀甯
@teachers = searchTeacherAndAssistant journals_for_message.jour
#鏀朵欢浜洪偖绠
@recipients ||= []
@teachers.each do |teacher|
- @recipients << teacher.user.mail
+ if teacher.user.notify_about? journals_for_message
+ @recipients << teacher.user.mail
+ end
+
end
mail :to => @recipients,
:subject => "#{l(:label_your_course)}#{journals_for_message.jour.name}#{l(:label_have_message)} "
@@ -440,10 +444,7 @@ class Mailer < ActionMailer::Base
headers[:to].delete(@author.mail) if headers[:to].is_a?(Array)
headers[:cc].delete(@author.mail) if headers[:cc].is_a?(Array)
end
- if !User.current.nil?
- #涓嶇粰鏈汉鍙戦偖浠
- headers[:to].delete(User.current.mail) if headers[:to].is_a?(Array)
- end
+
if @author && @author.logged?
redmine_headers 'Sender' => @author.login
end
diff --git a/app/models/relative_memo.rb b/app/models/relative_memo.rb
index 073d1ca12..f087fce2b 100644
--- a/app/models/relative_memo.rb
+++ b/app/models/relative_memo.rb
@@ -70,6 +70,11 @@ class RelativeMemo < ActiveRecord::Base
def cannot_reply_to_locked_topic
errors.add :base, l(:label_memo_locked) if root.locked? && self != root
end
+
+ def short_content(length = 25)
+ str = "^(.{,#{length}})[^\n\r]*.*$"
+ content.gsub(Regexp.new(str), '\1...').strip if content
+ end
# def update_memos_forum
# if forum_id_changed?
diff --git a/app/models/softapplication.rb b/app/models/softapplication.rb
index 5e1e1bd50..f7eed43fc 100644
--- a/app/models/softapplication.rb
+++ b/app/models/softapplication.rb
@@ -6,10 +6,11 @@ class Softapplication < ActiveRecord::Base
has_many :journals_for_messages, :as => :jour, :dependent => :destroy
has_many :contesting_softapplications, :dependent => :destroy
- has_many :projecting_softapplications, :dependent => :destroy
+ #has_many :projecting_softapplications, :dependent => :destroy
belongs_to :user
belongs_to :project
has_many :contests, :through => :contesting_softapplications
+ belongs_to :project
def add_jour(user, notes, reference_user_id = 0, options = {})
if options.count == 0
diff --git a/app/models/user.rb b/app/models/user.rb
index d376cd858..d664a0881 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -86,8 +86,6 @@ class User < Principal
## added by xianbo for delete
has_many :biding_projects, :dependent => :destroy
has_many :contesting_projects, :dependent => :destroy
- has_many :contesting_softapplications, :dependent => :destroy
- has_many :projecting_softapplications, :dependent => :destroy
belongs_to :softapplication, :foreign_key => 'id', :dependent => :destroy
##ended by xianbo
@@ -199,6 +197,53 @@ class User < Principal
end
}
+
+ # ======================================================================
+ # 闆嗕腑澶勭悊 User 鎵╁睍琛ㄤ负绌虹殑闂
+ validate :valid_user_extensions
+ after_save :save_user_extensions
+
+ def extensions
+ self.user_extensions ||= UserExtensions.new
+ end
+
+ def respond_to?(m, include_private = false)
+ flag = UserExtensions.instance_methods.include? m.to_sym
+ if flag
+ flag
+ else
+ super
+ end
+ end
+
+ def method_missing m, *args, &block
+ if extensions.respond_to? m.to_sym
+ self.class.send :define_method, m.to_sym, *args do
+ self.extensions.__send__ m.to_sym, *args
+ end
+ __send__ m.to_sym, *args, &block
+
+ else
+ super
+ end
+ end
+
+ def valid_user_extensions
+ if !self.extensions.valid?
+ self.extensions.errors.messages.each do |key, values|
+ values.each do |value|
+ self.errors.add key, value
+ end
+ end
+ end
+ end
+
+ def save_user_extensions
+ self.extensions.save
+ end
+ # 闆嗕腑澶勭悊 User 鎵╁睍琛ㄤ负绌虹殑闂 < end
+ # ======================================================================
+
#閫夋嫨椤圭洰鎴愬憳鏃舵樉绀虹殑鐢ㄦ埛淇℃伅鏂囧瓧
def userInfo
info=self.nickname + ' (' + self.realname + ')';
@@ -665,6 +710,7 @@ class User < Principal
end
end
+
# Return true if the user is allowed to do the specified action on a specific context
# Action can be:
# * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
@@ -768,10 +814,39 @@ class User < Principal
when News
# always send to project members except when mail_notification is set to 'none'
true
+ #鍒ゅ畾鐢ㄦ埛鏄惁鎺ュ彈鐣欒█鎻愰啋閭欢
+ when JournalsForMessage
+ ##濡傛灉鏄洿鎺ョ暀瑷骞朵笖鐣欒█瀵硅薄鏄疨roject骞朵笖Project绫诲瀷鏄绋嬶紙璇剧▼鐣欒█锛
+ if !object.at_user && object.jour.class.to_s.to_sym == :Project && object.jour.project_type == 1
+ #鏍规嵁鐢ㄦ埛璁剧疆閭欢鎺ユ敹妯″紡鍒ゅ畾褰撳墠鐢ㄦ埛鏄惁鎺ュ彈閭欢鎻愰啋
+ is_notified_project object.jour
+ end
+
end
end
end
+ #鐢ㄦ埛鏄惁鎺ユ敹project鐨勬秷鎭彁閱
+ def is_notified_project arg
+ if arg.is_a?(Project)
+ case mail_notification
+ when 'selected'
+ notified_projects_ids.include?(arg.id)
+ when 'only_my_events'
+ projects.include?(arg)
+ when 'only_assigned'
+ false
+ when 'only_owner'
+ course = Course.find_by_extra(arg.identifier)
+ course.teacher == self
+ end
+ #鍕鹃夌殑椤圭洰鎴栫敤鎴风殑椤圭洰 TODO锛氶渶鏀
+ #notified_projects_ids.include?(arg) || projects.include?(arg)
+ else
+ false
+ end
+ end
+
def self.current=(user)
Thread.current[:current_user] = user
end
diff --git a/app/models/user_scores.rb b/app/models/user_score.rb
similarity index 96%
rename from app/models/user_scores.rb
rename to app/models/user_score.rb
index c939a20ff..f383d6670 100644
--- a/app/models/user_scores.rb
+++ b/app/models/user_score.rb
@@ -1,36 +1,36 @@
-# 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.
-
-class UserScore < ActiveRecord::Base
- belongs_to :user
-
- def self.find_max_file
- self.maximum(:file)
- end
-
- def self.find_min_file
- self.minimum(:file)
- end
-
- def self.find_max_issue
- self.maximum(:issue)
- end
-
- def self.find_min_issue
- self.minimum(:file)
- end
-end
+# 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.
+
+class UserScore < ActiveRecord::Base
+ belongs_to :user
+
+ def self.find_max_file
+ self.maximum(:file)
+ end
+
+ def self.find_min_file
+ self.minimum(:file)
+ end
+
+ def self.find_max_issue
+ self.maximum(:issue)
+ end
+
+ def self.find_min_issue
+ self.minimum(:file)
+ end
+end
diff --git a/app/views/attachments/_temp.html.erb b/app/views/attachments/_temp.html.erb
new file mode 100644
index 000000000..c5a3661da
--- /dev/null
+++ b/app/views/attachments/_temp.html.erb
@@ -0,0 +1,3 @@
+