Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Gemfile.lock

@@ -125,6 +125,7 @@ GEM
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
+    mysql2 (0.3.11)
     mysql2 (0.3.11-x86-mingw32)
     net-ldap (0.3.1)
     nokogiri (1.6.3)

app/controllers/account_controller.rb

@@ -66,7 +66,7 @@ class AccountController < ApplicationController
         if @user.save
           @token.destroy
           flash[:notice] = l(:notice_account_password_updated)
-          redirect_to signin_url
+          redirect_to signin_path
           return
         end
       end
@@ -92,7 +92,7 @@ class AccountController < ApplicationController
             Mailer.lost_password(token).deliver
           end
             flash[:notice] = l(:notice_account_lost_email_sent)
-            redirect_to signin_url
+            redirect_to signin_path
           return                      
         end
       end
@@ -103,7 +103,7 @@ class AccountController < ApplicationController
   def register
     # @root_path="/home/pdl/redmine-2.3.2-0/apache2/"
 #
-    #@cache_identityy = params[:identity]||""                 #身份
+    @cache_identityy = params[:identity]||""                 #身份
     @cache_no = params[:no]||""                              #学号
     @cache_technical_title = params[:technical_title]||""    #教师职称
     @cache_province = params[:province]||""                  #省份
@@ -144,7 +144,22 @@ class AccountController < ApplicationController
           @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
         end
 
-
+        if(@cache_identityy == "")
+          if params[:identity] == "2"
+            @user.firstname = firstname_code
+            @user.lastname = lastname_code
+          end
+          flash.now[:error]= l(:label_identity)+l(:'activerecord.errors.messages.empty')
+          return
+        end
+        if(@cache_city == "")
+          if params[:identity] == "2"
+            @user.firstname = firstname_code
+            @user.lastname = lastname_code
+          end
+          flash.now[:error]= l(:label_location)+l(:'activerecord.errors.messages.empty')
+          return
+        end
 
         case Setting.self_registration
         when '1'
@@ -189,7 +204,7 @@ class AccountController < ApplicationController
       token.destroy
       flash[:notice] = l(:notice_account_activated)
     end
-    redirect_to signin_url
+    redirect_to signin_path
   end
 
   def valid_ajax
@@ -219,10 +234,6 @@ class AccountController < ApplicationController
     render :json => req
   end
 
-  def email_valid
-
-  end
-
   private
 
   def authenticate_user
@@ -234,7 +245,7 @@ class AccountController < ApplicationController
   end
 
   def password_authentication
-    user, last_login_on = User.try_to_login(params[:username], params[:password])
+    user = User.try_to_login(params[:username], params[:password])
  
     if user.nil?
       invalid_credentials
@@ -244,7 +255,7 @@ class AccountController < ApplicationController
       onthefly_creation_failed(user, {:login => user.login, :auth_source_id => user.auth_source_id })
     else
       # Valid user
-      successful_authentication(user, last_login_on)
+      successful_authentication(user)
     end
   end
 
@@ -291,7 +302,7 @@ class AccountController < ApplicationController
     end
   end
 
-  def successful_authentication(user, last_login_on)
+  def successful_authentication(user)
     logger.info "Successful authentication for '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}"
     # Valid user
     self.logged_user = user
@@ -304,18 +315,13 @@ class AccountController < ApplicationController
     code = /\d*/
     #根据home_url生产正则表达式
     eval("code = " + "/^" + home_url.gsub(/\//,"\\\/") + "\\\/*(welcome)?\\\/*(\\\/index\\\/*.*)?\$/")
-    if code=~params[:back_url] && last_login_on != ''
+    if code=~params[:back_url]
       redirect_to user_activities_path(user)
     else
-      if last_login_on == ''
-        redirect_to my_account_url
-      else
       #by young
       #redirect_back_or_default my_page_path
-      #sredirect_back_or_default User.current
-      redirect_to my_account_url
+      redirect_back_or_default User.current
       #redirect_to User.current
-      end
     end
   end
 
@@ -357,7 +363,7 @@ class AccountController < ApplicationController
       UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
       Mailer.register(token).deliver
       flash[:notice] = l(:notice_account_register_done)
-      render action: 'email_valid', locals: {:mail => user.mail}
+      redirect_to signin_path
     else
       yield if block_given?
     end
@@ -374,7 +380,7 @@ class AccountController < ApplicationController
       UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
       self.logged_user = user
       flash[:notice] = l(:notice_account_activated)
-      redirect_to my_account_url
+      redirect_to my_account_path
     else
       yield if block_given?
     end
@@ -396,6 +402,6 @@ class AccountController < ApplicationController
 
   def account_pending
     flash[:notice] = l(:notice_account_pending)
-    redirect_to signin_url
+    redirect_to signin_path
   end
 end

app/controllers/application_controller.rb

@@ -124,7 +124,7 @@ class ApplicationController < ActionController::Base
       else
         # HTTP Basic, either username/password or API key/random
         authenticate_with_http_basic do |username, password|
-          user = User.try_to_login(username, password)[0] || User.find_by_api_key(username)
+          user = User.try_to_login(username, password) || User.find_by_api_key(username)
         end
       end
       # Switch user if requested by an admin user

app/models/user.rb

@@ -75,7 +75,6 @@ class User < Principal
 
   has_many :homework_users
   has_many :homework_attaches, :through => :homework_users
-  has_many :homework_evaluations
 
   has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
                                    :after_remove => Proc.new {|user, group| group.user_removed(user)}
@@ -168,7 +167,7 @@ class User < Principal
   LOGIN_LENGTH_LIMIT = 25
   MAIL_LENGTH_LIMIT = 60
 
-  validates_presence_of :login,  :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
+  validates_presence_of :login, :firstname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
   validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, :case_sensitive => false
   validates_uniqueness_of :mail, :if => Proc.new { |user| user.mail_changed? && user.mail.present? }, :case_sensitive => false
   # Login must contain letters, numbers, underscores only
@@ -199,19 +198,13 @@ class User < Principal
   }
   scope :sorted, lambda { order(*User.fields_for_order_statement)}
   
-  scope :like, lambda {|arg, type|
+  scope :like, lambda {|arg|
     if arg.blank?
       where(nil)
     else
       pattern = "%#{arg.to_s.strip.downcase}%"
       #where(" LOWER(concat(lastname, firstname)) LIKE :p ", :p => pattern)
-      if type == "0"
-        where(" LOWER(login) LIKE :p ", :p => pattern)
-      elsif type == "1"
-        where(" LOWER(concat(lastname, firstname)) LIKE :p ", :p => pattern)
-      else
-        where(" LOWER(mail) LIKE :p ", :p => pattern)
-      end
+      where(" LOWER(login) LIKE :p ", :p => pattern)
     end
   }
 
@@ -230,12 +223,7 @@ class User < Principal
 
   #选择项目成员时显示的用户信息文字
   def userInfo
-    if self.realname.gsub(' ','') == "" || self.realname.nil?
-      info = self.nickname;
-    else
-      info=self.nickname + '   (' + self.realname + ')';
-    end
-    info
+   info=self.nickname + '   (' + self.realname + ')';
   end
   
    ###添加留言   fq
@@ -364,9 +352,8 @@ class User < Principal
         end
       end
     end
-    last_login_on = user.last_login_on.nil? ? '' : user.last_login_on.to_s
     user.update_column(:last_login_on, Time.now) if user && !user.new_record?
-    [user, last_login_on]
+    user
   rescue => text
     raise text
   end

app/views/account/login.html.erb

@@ -26,11 +26,7 @@
 <%= back_url_hidden_field_tag %>
 <table>
 <tr>
-    <td align="right">
-      <label for="username">
-        <%=l(:lable_user_name)%>:
-      </label>
-    </td>
+    <td align="right"><label for="username"><%=l(:lable_user_name)%>:</label></td>
     <td align="left">
       <%= text_field_tag 'username', params[:username], :tabindex => '1' , :value => "#{l(:label_login_prompt)}",
                          :onfocus => "clearInfo('username','#{l(:label_login_prompt)}')",
@@ -39,48 +35,33 @@
     </td>
 </tr>
 <tr>
-    <td align="right">
-      <label for="password">
-        <%=l(:field_password)%>:
-      </label>
-    </td>
-    <td align="left">
-      <%= password_field_tag 'password', nil, :tabindex => '2' %>
-    </td>
+    <td align="right"><label for="password"><%=l(:field_password)%>:</label></td>
+    <td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>
 </tr>
 <% if Setting.openid? %>
 <tr>
-  <td align="right">
-    <label for="openid_url">
-      <%=l(:field_identity_url)%>
-    </label>
-  </td>
-  <td align="left">
-    <%= text_field_tag "openid_url", nil, :tabindex => '3' %>
-  </td>
+  <td align="right"><label for="openid_url"><%=l(:field_identity_url)%></label></td>
+  <td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td>
 </tr>
 <% end %>
 <tr>
     <td></td>
     <td align="left">
         <% if Setting.autologin? %>
-        <label for="autologin">
-          <%= check_box_tag 'autologin', 1, false, :tabindex => 4 %>
-          <%= l(:label_stay_logged_in) %>
-        </label>
+        <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
         <% end %>
     </td>
 </tr>
 <tr>
     <td colspan="2" >
     	
-       <span style="float: left">
-         <% if Setting.lost_password? %>
+       <span style="float: left"><% if Setting.lost_password? %>
             <%= link_to l(:label_password_lost), lost_password_path %>
         <% end %></span>
    
     <span style="float: right">
         <input type="submit" class="small" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/></span>
+        
     </td>
 </tr>
 </table>

app/views/bids/_bid_homework_show.html.erb

@@ -28,7 +28,6 @@
         color: #fff;
         text-align: center;
         padding: 5px !important;
-        display: none;
     }
     .span_wping a:hover{ background-color:#03a1b3;}
 </style>
@@ -76,7 +75,7 @@
                       <% end %>
                   <% end %>
                   <% if (User.current.admin?||User.current.id==bid.author_id) %>
-                      <% if bid.open_anonymous_evaluation == 1%>
+                      <% if bid.open_anonymous_evaluation == 1 && bid.homeworks.count >= 2%>
                         <span id="<%=bid.id %>_anonymous_comment" class="span_wping">
                           <% case bid.comment_status %>
                           <% when 0 %>

app/views/layouts/base_homework.html.erb

@@ -118,7 +118,7 @@
                         <% if (User.current.admin?||User.current.id==@bid.author_id) %>
                             <tr>
                               <td valign="top" style="padding-left: 8px; font-size: 15px" colspan="2">
-                                <% if @bid.open_anonymous_evaluation == 1%>
+                                <% if @bid.open_anonymous_evaluation == 1  && @bid.homeworks.count >= 2%>
                                  <span id="<%=@bid.id %>_anonymous_comment" class="span_wping">
                                       <% case @bid.comment_status %>
                                       <% when 0 %>

public/javascripts/application.js

@@ -2,6 +2,8 @@
 /* Redmine - project management software
  Copyright (C) 2006-2013  Jean-Philippe Lang */
 
+
+
 function cleanArray (actual){
     var newArray = new Array();
     for (var i = 0; i< actual.length; i++){
@@ -389,6 +391,7 @@ function submitPreview(url, form, target) {
     $.ajax({
         url: url,
         type: 'post',
+        beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
         data: $('#'+form).serialize(),
         success: function(data){
             $('#'+target).html(data);
@@ -433,6 +436,7 @@ function scmEntryClick(id, url) {
     el.addClass('loading');
     $.ajax({
         url: url,
+        beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
         success: function(data){
             el.after(data);
             el.addClass('open').addClass('loaded').removeClass('loading');
@@ -454,6 +458,7 @@ function randomKey(size) {
 function updateIssueFrom(url) {
     $.ajax({
         url: url,
+        beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
         type: 'post',
         data: $('#issue-form').serialize()
     });
@@ -462,6 +467,7 @@ function updateIssueFrom(url) {
 function updateBulkEditFrom(url) {
     $.ajax({
         url: url,
+        beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
         type: 'post',
         data: $('#bulk_edit_form').serialize()
     });
@@ -500,6 +506,7 @@ function observeSearchfield(fieldId, targetId, url) {
                 $.ajax({
                     url: url,
                     type: 'get',
+                    beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
                     data: {q: $this.val()},
                     success: function(data){ if(targetId) $('#'+targetId).html(data); },
                     beforeSend: function(){ $this.addClass('ajax-loading'); },
@@ -540,6 +547,7 @@ function initMyPageSortable(list, url) {
             $.ajax({
                 url: url,
                 type: 'post',
+                beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
                 data: {'blocks': $.map($('#list-'+list).children(), function(el){return $(el).attr('id');})}
             });
         }
@@ -621,6 +629,14 @@ function transpotUrl (scope) {
 $(document).ready(setupAjaxIndicator);
 $(document).ready(hideOnLoad);
 $(document).ready(addFormObserversForDoubleSubmit);
+$(document).ready(function(){
+        $.ajaxSetup({
+            headers: {
+                'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')
+            }
+        });
+    }
+)
 
 function img_thumbnails() {
     $('.thumbnails a').colorbox({rel:'nofollow'});

public/stylesheets/css.css

@@ -42,7 +42,7 @@ a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
 .dis ul li.wdown a{padding-top:25px; color:#3d7ec2; margin-right:35px;}
 .wscore{ padding-top:25px; color:#888888; width:96px;}
 .dis ul li.wping{margin-left:12px; }
-.dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:3px;}
+.dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:8px;}
 .dis ul li.wping a:hover{ background-color:#03a1b3;}
 ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px;line-height: 1.9; }
 .wlist span{ border:1px solid #15bccf; padding:0 5px; margin-left:3px;}
@@ -84,7 +84,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
 .ping_star span a:hover{background:url(images/star.png) -24px 0 no-repeat;}
 .ping_con textarea{ height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;}
 a.ping_sub{ float:right; height:22px; width:60px; margin-right:20px;  background:#15bccf; color:#fff; text-align:center;}
-a.ping_sub1{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;}
+a.ping_sub1{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;line-height: 1.9;}
 a:hover.ping_sub{ background:#14a8b9;}
 .recall{ border-top:1px solid #CCC; padding:5px 0;}
 .recall_head{ float:left;}