From e990a17fdb07bbf0c2862d90c884d06192026f0a Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Thu, 5 Dec 2013 15:50:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=99=E8=A8=80?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=201.=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E7=95=99=E8=A8=80=E6=A0=B7=E5=BC=8F=E4=B8=A2=E5=A4=B1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=202.=E5=AF=B9=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=EF=BC=8C=E4=BC=9A=E5=90=8C=E6=97=B6=E5=9C=A8?= =?UTF-8?q?=E8=AF=A5=E7=94=A8=E6=88=B7=E4=B8=BB=E9=A1=B5=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E7=95=99=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/words_controller.rb | 3 +++ app/views/words/_message.html.erb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index e58b1d67..bde91fcf 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -13,6 +13,9 @@ class WordsController < ApplicationController refer_user_id = params[:new_form][:reference_user_id].to_i @user.add_jour(User.current, message, refer_user_id) + unless refer_user_id == 0 + User.find(refer_user_id).add_jour(User.current, message, refer_user_id) + end @user.count_new_jour # if a_message.size > 5 # @message = a_message[-5, 5] diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index e45c7266..519f0062 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -19,7 +19,7 @@
- <%= h journal.notes%> + <%= textilizable journal.notes%>
<%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:project_module_documents),project_documents_path(@project) %> | -<%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:project_module_wiki),project_wiki_path(@project) %> | -
<%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:project_module_calendar),project_calendar_path(@project) %> - | -<%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %> - | -
<%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %> - | -<%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:project_module_files) ,project_files_path(@project) %> - | -
<%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:label_module_share) ,share_show_path(@project) %> - | -<%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:label_project_tool_response) ,project_feedback_path(@project) %> - | -
MH7oLjxiKU3d`gT%
zF`Y?DNa(M_TQ;>!X}WulX~(8-Mnlnm1l|6IH6hkq(DfMC78=_L)!AP~n$5#uQ5v0@
z!E~k6B9E)yaK(;C$O|tri?RI{G01Jp+~IOQ-oN64 dz+#n%RWcP^|YVb*?OqsB_uniTMX@
zP$H^U_01QDDYQdqvmB5pV6IU#7{3|SFG>>Fj}CqPBr=W33R5`vpq;zHO~3=THJ@hF
z7UnT&=d@%-8X|yahc2lf&1U^l@pbdeW;gBIn(2weiXp2UrYexXE5VHhbPK%WB3q;-
z2aI$#ne&bL?ETojlxaRDh_l=iUOcW2^j`0rq{8x<5Cv~w$zs;;PZ!Kw--5PJ~M3
zkrN3iPC&=G>A0oDsN-+aitYZXn}@$OKif-t7$oHR)=WHKk1Jq;pN19~jk|o`N5E>S
zSe$qOeb+K1f(^ERPOuOjGIC*xw4FjeC0A^WOn9(sSh#NN5{wi)6l=@!sieK8ey7CE
z=|%~uCj)&7=h2i-d=Y_5-s-)QE0=-U(uHj*MRmAW5JCvu&b@;{$dI1St=dOse7eL1
z3$$OtqjjYs+%OWYo2|i;E|#3Vp}B}n;Pg$|;xlf`oZalyaiZNx&ZndkY})gCS4c69
z-+0a1xeBqU^crT{-oZVoU6nOpxf>zpj8^R`P;tAe+<7}ax^oL3sbc|6OvWKYP8G-&
ztf~@R!_}^I#KxgsxM8vO7#P~?=pHGrhbQbiH3l(A%V?XcAgGt5S3EXL8Q$g(lT*(S
z;sp||w-oHx$aUj@oUIwvz6XcJ^KIn=p3}BK$r8*KK$idMd-@)5KSn|$YBn=460<9o
z>~Wb^FzEx_&zLRf&vdK5(`OZ_wk=~A)>as)tw{4E{aF%XDQLTR1PGV%Or1n(EU3Lh
z0P4~GaS+4IzQu-<5Bi_%WiXziXeWTR~T9K#?Z&lA6uWr-$v)u{4P5ptGK$Q6&Y7RJ!OerM$Y_CwWJ
zP!}6BPS=RjUADcz}$i}xG^Nd?Doyz
zPpHVDU%ehvz$1rW^VU^1%5w`o5Onxf2`{$pJZ`9cD@|(7usXIe9d@mhbIe^6%)_(X
zkR7M?27c=VBw9XFaM1~5%||={`Lo-Ra~9hA$a_>
0
zPU
ljuucUXxnF*<}H{