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

app/controllers/forums_controller.rb

@@ -296,7 +296,12 @@ class ForumsController < ApplicationController
 
   #检查forum的名字
   def check_forum_name
-    forum_name_exist = Forum.where("name = '#{params[:forum_name]}' and id != #{params[:forum_id]}").count >= 1 ? true : false
+    forum_name_exist = true
+    if params[:forum_id]
+      forum_name_exist = Forum.where("name = '#{params[:forum_name]}' and id != #{params[:forum_id]}").count >= 1 ? true : false
+    else
+      forum_name_exist = Forum.where("name = '#{params[:forum_name]}' ").count >= 1 ? true : false
+    end
     render :text => forum_name_exist
   end
 

app/controllers/users_controller.rb

@@ -130,7 +130,7 @@ class UsersController < ApplicationController
       when 'apply'
         @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
       when 'homework'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage') and user_id =?",  @user).order("created_at desc")
       when 'course_message'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
       # when 'forge_message'

app/views/forums/edit.html.erb

@@ -54,7 +54,7 @@
         $('#forum_name').keypress(function(e)
         {
             var n = 0;
-            var str = this.val().trim();
+            var str = this.value;
             for (i = 0; i < str.length; i++) {
                 var leg = str.charCodeAt(i);//ASCII码
                 if (leg > 255) {

app/views/forums/index.html.erb

@@ -51,9 +51,8 @@
       });
       $('#forum_name').keypress( function(e)
       {
-          alert(1)
           var n = 0;
-          var str = this.val().trim();
+          var str = this.value;
           for (i = 0; i < str.length; i++) {
               var leg = str.charCodeAt(i);//ASCII码
               if (leg > 255) {//大于255的都是中文
@@ -62,7 +61,6 @@
                   n += 1;//英文，不多说了
               }
           }
-          console.log(n)
           if(n >= 160 && e.keyCode != 8)
               if(document.all)
               {
@@ -98,7 +96,7 @@
       if( name != ""){
           $.get(
               '<%= check_forum_name_forums_path %>',
-              {"forum_name":name},
+              {"forum_name":encodeURIComponent(name)},
              function(data){
 
                  if( data == 'true'){

app/views/users/user_messages.html.erb

@@ -397,25 +397,26 @@
                 <% end %>
                 <% if ma.course_message_type == "JournalsForMessage" %>
                     <% if ma.course_message.jour_type == 'Course' %>
-                        <ul class="homepageNewsList fl">
+                          <% if params[:type] != 'homework' %>
-                          <li class="homepageNewsPortrait fl">
+                              <ul class="homepageNewsList fl">
-                            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+                                <li class="homepageNewsPortrait fl">
-                          </li>
+                                  <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
-                          <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                                </li>
-                            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">在课程中留言了：</span>
+                                <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-                          </li>
+                                  <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">在课程中留言了：</span>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                                </li>
-                            <%= link_to ma.course_message.notes.html_safe, course_feedback_path(:id => ma.course_id),
+                                <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                                        :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                                  <%= link_to ma.course_message.notes.html_safe, course_feedback_path(:id => ma.course_id),
-                                        :onmouseover => "message_titile_show($(this),event)",
+                                              :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseout => "message_titile_hide($(this))" %></a>
+                                              :onmouseover => "message_titile_show($(this),event)",
-                          </li>
+                                              :onmouseout => "message_titile_hide($(this))" %></a>
-                          <div style="display: none" class="message_title_red system_message_style">
+                                </li>
-                            <%= ma.course_message.notes.html_safe %>
+                                <div style="display: none" class="message_title_red system_message_style">
-                          </div>
+                                  <%= ma.course_message.notes.html_safe %>
-                          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+                                </div>
-                        </ul>
+                                <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-
+                              </ul>
+                          <% end %>
                     <% else %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl">

public/javascripts/new_user.js

@@ -340,7 +340,7 @@ function limitStrsize(id,length){
     $('#'+id).keypress(function(e)
     {
         var n = 0;
-        var str = this.val().trim();
+        var str = this.value;
         for (i = 0; i < str.length; i++) {
             var leg = str.charCodeAt(i);//ASCII码
             if (leg > 255) {//大于255的都是中文