Merge branch 'szzh' into dev_zanle

Conflicts:
	Gemfile

.gitignore

@@ -4,6 +4,7 @@
 /.bundle
 *.swp
 /config/database.yml
+/config/configuration.yml
 /files/*
 /log/*
 /public/tmp/*
@@ -16,5 +17,4 @@
 /db/schema.rb
 /Gemfile.lock
 /lib/plugins/acts_as_versioned/test/debug.log
-/config/configuration.yml
 .rbenv-gemsets

app/controllers/courses_controller.rb

@@ -273,6 +273,7 @@ class CoursesController < ApplicationController
 
     if valid_attr.eql?('name')
       faker.name = valid_value
+      faker.course_id =  params[:course_id]
       faker.valid?
       req[:valid] = faker.errors[:name].blank?
       req[:message] = faker.errors[:name]

app/models/course_group.rb

@@ -12,11 +12,20 @@ class CourseGroup < ActiveRecord::Base
   before_destroy :set_member_nil
 
   attr_accessible :name
-  validates :name, :presence => true, :length => {:maximum => 20},
+  validates :name, :presence => true, :length => {:maximum => 20}
-            :uniqueness => {case_sensitive: false}
+  validate :unique_name_and_course
+
+
+
   def set_member_nil
     if self.members && self.members.count > 0
        self.members.update_all("course_group_id = 0")
     end
   end
+  private
+  def unique_name_and_course
+    if CourseGroup.where("name=? and course_id=?", name, course_id).first
+      errors.add(:name, :groupname_repeat)
+    end
+  end
 end

app/models/issue_observer.rb

@@ -19,7 +19,8 @@ class IssueObserver < ActiveRecord::Observer
  
   def after_create(issue)
     Thread.start do
-      recipients = issue.recipients
+      # 将跟踪者与本项目的其他成员都设为收件方，并去重，不在进行抄送，
+      recipients = issue.recipients - issue.watcher_recipients + issue.watcher_recipients
       recipients.each do |rec|
         Mailer.issue_add(issue,rec).deliver if Setting.notified_events.include?('issue_added')
       end

app/models/journal_observer.rb

@@ -24,7 +24,8 @@ class JournalObserver < ActiveRecord::Observer
         (Setting.notified_events.include?('issue_priority_updated') && journal.new_value_for('priority_id').present?)
         )
       Thread.start do
-        recipients = journal.recipients
+        # 将跟踪者与本项目的其他成员都设为收件方，并去重，不在进行抄送，
+        recipients = journal.recipients - journal.watcher_recipients + journal.watcher_recipients
         recipients.each do |rec|
 
           Mailer.issue_edit(journal,rec).deliver

app/models/mailer.rb

@@ -147,13 +147,11 @@ class Mailer < ActionMailer::Base
      @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id,  :token => @token.value)
 
       @user_url = url_for(my_account_url(user,:token => @token.value))
-    cc = nil
+
-    if recipients == issue.recipients[0]
+
-      cc = issue.watcher_recipients - issue.recipients
-    end
     subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
     mail(:to => recipients,
-         :cc => cc,
+
          :subject => subject)
   end
     # issue.attachments.each do |attach|
@@ -198,11 +196,7 @@ class Mailer < ActionMailer::Base
 
 
 
-    # Watchers in cc
+
-    cc = nil
-    if recipients == journal.recipients[0]
-      cc = journal.watcher_recipients - journal.recipients
-    end
 
     s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
     s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
@@ -211,7 +205,7 @@ class Mailer < ActionMailer::Base
     @journal = journal
    # @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue, :anchor => "change-#{journal.id}")
     mail(:to => recipients,
-         :cc => cc,
+
          :subject => s)
   end
 

app/models/user.rb

@@ -188,7 +188,7 @@ class User < Principal
   validates_confirmation_of :password, :allow_nil => true
   validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true
   validate :validate_password_length
-  validates_email_realness_of :mail
+  #validates_email_realness_of :mail
   before_create :set_mail_notification
   before_save   :update_hashed_password
   before_destroy :remove_references_before_destroy

app/views/courses/member.html.erb

@@ -6,7 +6,8 @@
                $.get(
                '<%=valid_ajax_course_path%>',
                { valid: "name",
-                   value: document.getElementById('group_name').value },
+                   value: document.getElementById('group_name').value,
+                    course_id: <%= @course.id %> },
                function (data) {
                    if (!data.valid) {
                        alert(data.message);

app/views/mailer/_issue.html.erb

@@ -1,7 +1,7 @@
 <!-- <h1><%#= link_to(h("#{issue.tracker.name} ##{issue.project_index}: #{issue.subject}"), issue_url) %></h1> -->
 <p>
       <span class="c_blue" style="color:#1b55a7;">
-        <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
+        <%= link_to(h("#{@author.login}(#{@author.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
      </span><%= l(:mail_issue_title_userin)%>
   <span class="c_blue" style="color:#1b55a7;"><%= link_to(h("#{@issue.project.name}"), @project_url, :style=>'color:#1b55a7; font-weight:bold;') %></span><%= l(:mail_issue_title_active)%></p>
 <div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">

app/views/mailer/_issue.text.erb

@@ -1,5 +1,5 @@
 
-        <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
+        <%= link_to(h("#{@author.login}(#{@author.show_name})"), @issue_author_url) %>
      <%= l(:mail_issue_title_userin)%>
  <%= link_to(h("#{@issue.project.name}"),@project_url) %><%= l(:mail_issue_title_active)%>
 <%= l(:mail_issue_subject)%><%= link_to(issue.subject, issue_url) %>

app/views/mailer/journals_for_message_add.html.erb

@@ -1,5 +1,5 @@
 <em>尊敬的用户，<%= @user %>给你留言了:</em>
 <div><%= @message %></div>
-<h1>点击链接查看最新回复<%= link_to(@url, @url) %></h1>
+<p>点击链接查看最新回复<%= link_to(@url, @url) %>
-&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<h4><%= link_to(l(:lable_not_receive_mail),"http://" + Setting.host_name + "/my/account")%></h4>
+&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<%= link_to(l(:lable_not_receive_mail),"http://" + Setting.host_name + "/my/account")%></p>
 

app/views/mailer/message_posted.html.erb

@@ -1,10 +1,37 @@
-<h1>
-  <% if @message.project %>
-      <%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %>
-  <% elsif @message.course %>
-      <%=h @message.board.course.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %>
-  <% end %>
-</h1>
-<em><%=h @message.author %></em>
 
-<%= textilizable(@message, :content, :only_path => false) %>
+<p>
+      <span class="c_blue" style="color:#1b55a7;">
+        <%= h @message.author %>(<%= @message.author.show_name %>)
+     </span><%= l(:mail_issue_title_userin)%>
+  <span class="c_blue" style="color:#1b55a7;">
+     <% if @message.project %>
+      <%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+  <% elsif @message.course %>
+             <%=h @message.board.course.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+      <% end %>
+  </span><%= l(:mail_issue_title_active)%></p>
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 526px"> <%= link_to(h(@message.subject), @message_url, :style=>'color:#1b55a7; font-weight:bold;') %></span></li>
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span>
+      <% if @message.project %>
+      <span style="float: left; width: 526px"><%=h @message.board.project.name %> - <%=h @message.board.name %></span>
+      <% elsif @message.course %>
+          <span style="float: left; width: 526px"><%=h @message.board.course.name %> - <%=h @message.board.name %></span>
+        <% end %>
+    </li>
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<%= @message.content %>
+        </span>
+    </li>
+
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+    <%= link_to(h(:mail_issue_reply), @message_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
+  </label>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>
+
+

config/configuration.yml

@@ -87,12 +87,12 @@ default:
       
    
 
-      address: smtp.163.com
+      address: smtp.126.com
       port: 25
-      domain: smtp.163.com
+      domain: smtp.126.com
       authentication: :plain
-      user_name: mcb592@163.com
+      user_name: "alanlong9278@126.com"
-      password: 'mcb1989822'
+      password: 'alanlong8788786'
 
   # Absolute path to the directory where attachments are stored.
   # The default is the 'files' directory in your Redmine instance.

config/locales/zh.yml

@@ -152,7 +152,7 @@ zh:
         not_same_project: "不属于同一个项目"
         circular_dependency: "此关联将导致循环依赖"
         cant_link_an_issue_with_a_descendant: "问题不能关联到它的子任务"
-
+        groupname_repeat: "该班名已存在"
 
 
   actionview_instancetag_blank_option: 请选择
@@ -598,6 +598,7 @@ zh:
   label_document_added: 文档已添加
   label_forum_message_added: 发帖成功
   label_forum_add: 贴吧创建成功
+  label_message_reply: 回帖人
   label_document_public_info: （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该文档。）
   label_role: 角色
   label_role_plural: 角色