From e788cd9a0f964a3770c6abfa79419c06231ffe2f Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 2 Dec 2014 17:06:17 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=20#1149=20=E8=B5=84=E6=BA=90=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=EF=BC=9A=E5=B9=B3=E5=8F=B0=E6=8F=90=E7=A4=BA=E8=AF=B4?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E6=90=9C=E7=B4=A2=E7=A7=81=E6=9C=89=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=B8=AD=E7=9A=84=E5=86=85=E5=AE=B9=EF=BC=8C=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E4=B8=8A=E5=8D=B4=E5=8F=AF=E6=90=9C=E7=B4=A2=E5=BE=97?=
 =?UTF-8?q?=E5=88=B0=E7=A7=81=E6=9C=89=E9=A1=B9=E7=9B=AE=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/stores_controller.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/controllers/stores_controller.rb b/app/controllers/stores_controller.rb
index a68d12517..b1705c826 100644
--- a/app/controllers/stores_controller.rb
+++ b/app/controllers/stores_controller.rb
@@ -26,19 +26,19 @@ class StoresController < ApplicationController
     resultSet = Attachment.where("attachments.container_type IS NOT NULL AND filename LIKE :like ", like: "%#{keywords}%").
               reorder("created_on DESC")
     
-    # result = resultSet.to_a.dup
+    result = resultSet.to_a.dup
 
-    # resultSet.to_a.map { |res|
-    #   if(res.container.nil? || 
-    #     (res.container.class.to_s=="Project" && res.container.is_public == false) ||
-    #     (res.container.has_attribute?(:project) && res.container.project.is_public == false) ||
-    #     (res.container.class.to_s=="HomeworkAttach" && res.container.bid.reward_type == 3) ||
-    #     false
-    #     )
-    #     result.delete(res)
-    #   end
-    # }
-    # result
+    resultSet.to_a.map { |res|
+       if(res.container.nil? ||
+         (res.container.class.to_s=="Project" && res.container.is_public == false) ||
+         (res.container.has_attribute?(:project) && res.container.project.is_public == false) ||
+         (res.container.class.to_s=="HomeworkAttach" && res.container.bid.reward_type == 3) ||
+         false
+         ) || (res.container.is_a?(Course) && res.container.is_public == 0)
+         result.delete(res)
+       end
+    }
+    result
   end
 
   LIMIT = 12 unless const_defined?(:LIMIT)

From ebed04c7bf2adf902ef107c72adf3d57caa6b233 Mon Sep 17 00:00:00 2001
From: zhuhao <zh13964069093@163.com>
Date: Wed, 3 Dec 2014 11:05:52 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=88=9B=E5=AE=A2=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=85=AC=E5=85=B1=E9=A1=B5=E8=A2=AB=E6=8B=89?=
 =?UTF-8?q?=E4=BC=B8=E5=AF=BC=E8=87=B4=E5=87=BA=E7=8E=B0=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=9D=A1=E7=9A=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index ba84abc68..5276bcd01 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -189,7 +189,7 @@
 											<div id="introduction" style="display: none">
 												<%= form_for('new_form', :method => :post,
 												        :url => {:controller => 'words', :action => 'add_brief_introdution'}) do |f|%>
-                                                    <table border="0" width="100%" align="center" id="my_brief_introduction">
+                                                    <table border="0"   width="96%" align="center" id="my_brief_introduction">
                                                         <tr>
                                                             <td>
                                                               <%= f.text_area 'user_introduction', :rows => 3,

From 843811cf99915ce7ad6d3afac2fb54a50f2e564c Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 3 Dec 2014 11:16:14 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BA=8E=E4=BF=9D=E5=AD=98=E7=94=A8=E6=88=B7=E7=9A=84=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb | 32 +++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 279e89f13..70a1f340b 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -177,6 +177,38 @@ class AccountController < ApplicationController
     end
   end
 
+  def create_and_save_user login,password,email
+    @user = User.new
+    @user.admin = false
+    @user.register
+    @user.login = login
+    @user.mail = email
+    unless password.blank?
+      @user.password = password
+    end
+    case Setting.self_registration
+      when '1'
+        register_by_email_activation(@user)
+      when '3'
+        register_automatically(@user)
+      else
+        register_manually_by_administrator(@user)
+    end
+    if @user.id != nil
+      ue = @user.user_extensions ||= UserExtensions.new
+      #ue = UserExtensions.create(:identity => params[:identity].to_i,:technical_title => params[:technical_title], :gender => params[:gender].to_i, :user_id => @user.id, :student_id => )
+      #ue.identity = params[:identity].to_i
+      #ue.technical_title = params[:technical_title]
+      #ue.gender = params[:gender].to_i
+      ue.user_id = @user.id
+      #ue.student_id = params[:no]
+      #ue.location = params[:province] if params[:province] != nil
+      #ue.location_city = params[:city] if params[:city] != nil
+      ue.save
+    end
+    @user
+  end
+
   # Token based account activation
   def activate
     (redirect_to(home_url); return) unless Setting.self_registration? && params[:token].present?

From ec21a98e642278421f262475f553ee98c4a6ebbc Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 3 Dec 2014 16:14:11 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb | 4 ++--
 app/models/user.rb                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 70a1f340b..21be0f793 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -154,7 +154,7 @@ class AccountController < ApplicationController
         else
           register_manually_by_administrator(@user)
         end
-       
+
        #added by bai
         if @user.id != nil
           ue = @user.user_extensions ||= UserExtensions.new
@@ -168,7 +168,7 @@ class AccountController < ApplicationController
           ue.location_city = params[:city] if params[:city] != nil
           ue.save
         end
-        
+
       end
     end
     if params[:identity] == "2"
diff --git a/app/models/user.rb b/app/models/user.rb
index 29709519d..ef327f47f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -930,7 +930,7 @@ class User < Principal
 
   def validate_password_length
     # Password length validation based on setting
-    if !password.nil? && password.size < Setting.password_min_length.to_i
+    if password.nil? || password.size < Setting.password_min_length.to_i
       errors.add(:password, :too_short, :count => Setting.password_min_length.to_i)
     end
   end

From c7ceea445a659b7b8a02ee0def2d5d52056f473b Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 3 Dec 2014 17:50:35 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E8=B0=83=E7=94=A8=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb | 59 +++------------------------
 1 file changed, 6 insertions(+), 53 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 21be0f793..541aad681 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -101,33 +101,12 @@ class AccountController < ApplicationController
 
   # User self-registration
   def register
-    # @root_path="/home/pdl/redmine-2.3.2-0/apache2/"
-#
-    #@cache_identityy = params[:identity]||""                 #身份
-    @cache_no = params[:no]||""                              #学号
-    @cache_technical_title = params[:technical_title]||""    #教师职称
-    @cache_province = params[:province]||""                  #省份
-    @cache_city = params[:city]||""                          #城市
-    @cache_enterprise_name =  params[:enterprise_name]||""   #企业
-
-    firstname_code = ""
-    lastname_code = ""
     (redirect_to(home_url); return) unless Setting.self_registration? || session[:auth_source_registration]
     if request.get?
       session[:auth_source_registration] = nil
       @user = User.new(:language => current_language.to_s)
     else
       user_params = params[:user] || {}
-      @user = User.new
-      @user.safe_attributes = user_params
-      if params[:identity] == "2" #   2 企业
-        firstname_code = @user.firstname
-        lastname_code =  @user.lastname
-        @user.firstname = params[:enterprise_name]
-        @user.lastname = l(:field_enterprise)
-      end
-      @user.admin = false
-      @user.register
       if session[:auth_source_registration]
         @user.activate
         @user.login = session[:auth_source_registration][:login]
@@ -139,36 +118,7 @@ class AccountController < ApplicationController
           redirect_to my_account_path
         end
       else
-        @user.login = params[:user][:login]
-        unless user_params[:identity_url].present? && user_params[:password].blank? && user_params[:password_confirmation].blank?
-          @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
-        end
-
-
-
-        case Setting.self_registration
-        when '1'
-          register_by_email_activation(@user)
-        when '3'
-          register_automatically(@user)
-        else
-          register_manually_by_administrator(@user)
-        end
-
-       #added by bai
-        if @user.id != nil
-          ue = @user.user_extensions ||= UserExtensions.new
-          #ue = UserExtensions.create(:identity => params[:identity].to_i,:technical_title => params[:technical_title], :gender => params[:gender].to_i, :user_id => @user.id, :student_id => )
-          ue.identity = params[:identity].to_i
-          ue.technical_title = params[:technical_title]
-          ue.gender = params[:gender].to_i
-          ue.user_id = @user.id
-          ue.student_id = params[:no]
-          ue.location = params[:province] if params[:province] != nil
-          ue.location_city = params[:city] if params[:city] != nil
-          ue.save
-        end
-
+       create_and_save_user params[:user][:login],user_params[:password],user_params[:mail],user_params[:password_confirmation],true
       end
     end
     if params[:identity] == "2"
@@ -177,13 +127,16 @@ class AccountController < ApplicationController
     end
   end
 
-  def create_and_save_user login,password,email
+  #should_confirmation_password是否验证密码
+  def create_and_save_user login,password,email,password_confirmation,should_confirmation_password
     @user = User.new
     @user.admin = false
     @user.register
     @user.login = login
     @user.mail = email
-    unless password.blank?
+    if should_confirmation_password && !password.blank? && !password_confirmation.blank?
+      @user.password,@user.password_confirmation = password,password_confirmation
+    elsif !should_confirmation_password &&  !password.blank?
       @user.password = password
     end
     case Setting.self_registration

From f0259223123a966d103b13553e3c51f891c77a57 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 3 Dec 2014 17:51:28 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 541aad681..686f70a11 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -149,14 +149,7 @@ class AccountController < ApplicationController
     end
     if @user.id != nil
       ue = @user.user_extensions ||= UserExtensions.new
-      #ue = UserExtensions.create(:identity => params[:identity].to_i,:technical_title => params[:technical_title], :gender => params[:gender].to_i, :user_id => @user.id, :student_id => )
-      #ue.identity = params[:identity].to_i
-      #ue.technical_title = params[:technical_title]
-      #ue.gender = params[:gender].to_i
       ue.user_id = @user.id
-      #ue.student_id = params[:no]
-      #ue.location = params[:province] if params[:province] != nil
-      #ue.location_city = params[:city] if params[:city] != nil
       ue.save
     end
     @user

From d71581d8342d74a6048d703d5e274cd6dd57602c Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 4 Dec 2014 09:41:31 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E6=97=B6=E6=8A=A5=E5=AF=86=E7=A0=81=E8=BF=87?=
 =?UTF-8?q?=E7=9F=AD=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb | 2 ++
 app/models/user.rb                    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 686f70a11..ad6d568a5 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -138,6 +138,8 @@ class AccountController < ApplicationController
       @user.password,@user.password_confirmation = password,password_confirmation
     elsif !should_confirmation_password &&  !password.blank?
       @user.password = password
+    else
+      @user.password = ""
     end
     case Setting.self_registration
       when '1'
diff --git a/app/models/user.rb b/app/models/user.rb
index ef327f47f..29709519d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -930,7 +930,7 @@ class User < Principal
 
   def validate_password_length
     # Password length validation based on setting
-    if password.nil? || password.size < Setting.password_min_length.to_i
+    if !password.nil? && password.size < Setting.password_min_length.to_i
       errors.add(:password, :too_short, :count => Setting.password_min_length.to_i)
     end
   end

From 307dacb31978a1109802c46d95343ef246a86455 Mon Sep 17 00:00:00 2001
From: zhuhao <zh13964069093@163.com>
Date: Thu, 4 Dec 2014 11:07:26 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=8F=98=E4=BB=B7=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=90=8E=EF=BC=8C=E4=BF=9D=E5=AD=98=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/news/_course_show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 6f13c28c7..00cbc17de 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -69,9 +69,9 @@
                             :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
           <%= render :partial => 'course_form', :locals => { :f => f, :is_new => false } %>
           <%#= submit_tag l(:button_save) %>
-          <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'whiteButton m3p10' %>
+          <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'ButtonColor m3p10' %>
           <%#= preview_link preview_news_path(:course_id => @course, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %>
-          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %>
+          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'ButtonColor m3p10' %>
       <% end %>
       <div id="preview" class="wiki"></div>
     </div>