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

app/api/mobile/apis/courses.rb

@@ -258,7 +258,7 @@ module Mobile
           requires :course_id,type: Integer,desc: '课程id'
           optional :name,type:String,desc:'课件名称可能包含的字符'
         end
-        get ":course_id/attachments" do
+        post ":course_id/attachments" do
           cs = CoursesService.new
           count = cs.course_attachments params
           present :data, count, with: Mobile::Entities::Attachment

app/api/mobile/apis/users.rb

@@ -94,6 +94,31 @@ module Mobile
           present :status, 0
         end
 
+        desc "用户留言"
+        params do
+          requires :token, type: String
+          requires :user_id, type: Integer,desc: '被留言的用户id'
+        end
+        get ':user_id/messages' do
+          us = UsersService.new
+          jours = us.get_all_messages params
+          present :data,jours,with:Mobile::Entities::Jours
+          present :status,0
+        end
+
+        desc "给用户留言或回复用户留言"
+        params do
+          requires :token, type: String
+          requires :user_id, type: Integer,desc: '被留言的用户id'
+          requires :content,type:String,desc:'留言内容'
+          optional :refer_user_id,type:Integer,desc:'被回复的用户id'
+        end
+        post ':user_id/leave_message' do
+          us = UsersService.new
+          jours = us.leave_messages params,current_user
+          present :status,0
+        end
+
       end
     end
   end

app/services/users_service.rb

@@ -4,6 +4,7 @@ class UsersService
   include AvatarHelper
   include CoursesHelper
   include ApiHelper
+  include WordsHelper
   #将用户注册的功能函数写这里
   #参数约定
   #成功返回注册后的User实例，失败直接抛异常
@@ -154,6 +155,25 @@ class UsersService
     @user
   end
 
+  # 获取某个用户的所有留言信息
+  def get_all_messages params
+    user = User.find(params[:user_id])
+    jours = user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+    jours.update_all(:is_readed => true, :status => false)
+    jours.each do |journal|
+      fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
+    end
+    jours
+  end
+
+  # 给某个用户留言
+  def leave_messages params,current_user
+    user = User.find(params[:user_id])
+    user.add_jour(current_user, params[:content], params[:refer_user_id] ||= 0)
+    unless params[:refer_user_id].nil? || params[:refer_user_id] == 0 || params[:refer_user_id] == User.current.id
+      User.find(params[:refer_user_id]).add_jour(current_user, params[:content], params[:refer_user_id])
+    end
+  end
 
 
 

app/views/projects/settings.html.erb

@@ -1,6 +1,6 @@
 <script type="text/javascript">
-    <%if @select_tab%>
-      $(function(){
+    $(function(){
+        <%if @select_tab%>
           <%if @select_tab == "modules"%>
           project_setting(2);
           <% elsif @select_tab == "versions"%>
@@ -11,9 +11,9 @@
           $("#pro_st_edit_ku").toggle();
           <%else%>
           <% end%>
-          $("div[nhname='pro_setting']").show();
-      });
-    <% end%>
+        <% end%>
+        $("div[nhname='pro_setting']").show();
+    });
 </script>
 
 <div class="project_r_h">