From a50aff3fb42429d6c9761c46f1deab32a43d52bd Mon Sep 17 00:00:00 2001 From: xianbo Date: Thu, 24 Oct 2013 20:36:57 +0800 Subject: [PATCH] 1.add special reward 2.give a root controller in bid controller && give the administrator the root can change the reward who is deadine. --- app/controllers/bids_controller.rb | 2 +- app/views/bids/_list_projects.html.erb | 8 ++- app/views/bids/set_reward.js.erb | 3 + app/views/context_menus/time_entries.html.erb | 62 ++++++++++-------- app/views/courses/_set_join.js.erb | 4 +- public/images/bid/special_reward.png | Bin 0 -> 5731 bytes 6 files changed, 46 insertions(+), 33 deletions(-) create mode 100644 public/images/bid/special_reward.png diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index 557c0ae54..b1f0b987d 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -629,7 +629,7 @@ class BidsController < ApplicationController @b_p = nil @biding_project_id = nil - if params[:set_reward][:reward] + if params[:set_reward][:reward]&&((User.current.id==@bid.author_id)||User.current.admin) # @bid_id = params[:id] @biding_project_id = params[:set_reward][:b_id] @b_p = BidingProject.find_by_id(@biding_project_id) diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb index 74207a315..f54c6f982 100644 --- a/app/views/bids/_list_projects.html.erb +++ b/app/views/bids/_list_projects.html.erb @@ -22,7 +22,7 @@ - + <%= l(:label_system_grade) %>:<%= (b_project.project.project_status.grade.nil? ? 0 : b_project.project.project_status.grade) unless (b_project.project.project_status.nil? && b_project.project.nil?) %> <% if get_prize(b_project).nil? or get_prize(b_project) == "" %> <% if @bid.deadline < Date.today %> @@ -41,6 +41,8 @@ <% end %> <% when 2 %> <% case get_prize(b_project) %> + <% when '-1' %> + <%= image_tag("/images/bid/special_reward.png")%> <% when '0' %> <%= image_tag("/images/bid/first_reward.png")%> <% when '1' %> @@ -84,7 +86,7 @@ - <% if User.current.id == @bid.author_id && @bid.deadline > Date.today %> + <% if ((User.current.id == @bid.author_id) && (@bid.deadline > Date.today))||User.current.admin %> <%= toggle_link '评价', b_project.id.to_s %> @@ -97,7 +99,7 @@ <%= f.select :reward," " .html_safe %> <% when 2 %> - <%= f.select :reward," " + <%= f.select :reward," " .html_safe %> <% when 3 %> <%= f.select :reward," diff --git a/app/views/bids/set_reward.js.erb b/app/views/bids/set_reward.js.erb index 868de83be..f3f20aa55 100644 --- a/app/views/bids/set_reward.js.erb +++ b/app/views/bids/set_reward.js.erb @@ -17,6 +17,9 @@ else end when 2 case get_prize(@b_p) + when '-1' + image_tag("/images/bid/s_reward.png") + when '1' when '0' image_tag("/images/bid/first_reward.png") when '1' diff --git a/app/views/context_menus/time_entries.html.erb b/app/views/context_menus/time_entries.html.erb index 10dbcafd2..fa2bd6188 100644 --- a/app/views/context_menus/time_entries.html.erb +++ b/app/views/context_menus/time_entries.html.erb @@ -1,33 +1,41 @@
    - <% if !@time_entry.nil? -%> -
  • <%= context_menu_link l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => @time_entry}, - :class => 'icon-edit', :disabled => !@can[:edit] %>
    • - <% else %> -
  • <%= context_menu_link l(:button_edit), {:controller => 'timelog', :action => 'bulk_edit', :ids => @time_entries.collect(&:id)}, - :class => 'icon-edit', :disabled => !@can[:edit] %>
    • - <% end %> + <% if !@time_entry.nil? -%> +
  • + <%= context_menu_link l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => @time_entry}, + :class => 'icon-edit', :disabled => !@can[:edit] %> +
    • + <% else %> +
  • + <%= context_menu_link l(:button_edit), {:controller => 'timelog', :action => 'bulk_edit', :ids => @time_entries.collect(&:id)}, + :class => 'icon-edit', :disabled => !@can[:edit] %> +
    • + <% end %> - <%= call_hook(:view_time_entries_context_menu_start, {:time_entries => @time_entries, :can => @can, :back => @back }) %> + <%= call_hook(:view_time_entries_context_menu_start, {:time_entries => @time_entries, :can => @can, :back => @back }) %> - <% if @activities.present? -%> -
  • - <%= l(:field_activity) %> -
      - <% @activities.each do |u| -%> -
    • <%= context_menu_link h(u.name), {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => u}, :back_url => @back}, :method => :post, - :selected => (@time_entry && u == @time_entry.activity), :disabled => !@can[:edit] %>
      • - <% end -%> -
    • <%= context_menu_link l(:label_none), {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => 'none'}, :back_url => @back}, :method => :post, - :selected => (@time_entry && @time_entry.activity.nil?), :disabled => !@can[:edit] %>
      • -
    -
    • - <% end %> + <% if @activities.present? -%> +
  • + <%= l(:field_activity) %> +
      + <% @activities.each do |u| -%> +
    • + <%= context_menu_link h(u.name), {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => u}, :back_url => @back}, :method => :post, + :selected => (@time_entry && u == @time_entry.activity), :disabled => !@can[:edit] %> +
      • + <% end -%> +
    • + <%= context_menu_link l(:label_none), {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => 'none'}, :back_url => @back}, :method => :post, + :selected => (@time_entry && @time_entry.activity.nil?), :disabled => !@can[:edit] %> +
      • +
    +
    • + <% end %> - <%= call_hook(:view_time_entries_context_menu_end, {:time_entries => @time_entries, :can => @can, :back => @back }) %> + <%= call_hook(:view_time_entries_context_menu_end, {:time_entries => @time_entries, :can => @can, :back => @back }) %> -
  • - <%= context_menu_link l(:button_delete), - {:controller => 'timelog', :action => 'destroy', :ids => @time_entries.collect(&:id), :back_url => @back}, - :method => :delete, :data => {:confirm => l(:text_time_entries_destroy_confirmation)}, :class => 'icon-del', :disabled => !@can[:delete] %> -
    • +
  • + <%= context_menu_link l(:button_delete), + {:controller => 'timelog', :action => 'destroy', :ids => @time_entries.collect(&:id), :back_url => @back}, + :method => :delete, :data => {:confirm => l(:text_time_entries_destroy_confirmation)}, :class => 'icon-del', :disabled => !@can[:delete] %> +
diff --git a/app/views/courses/_set_join.js.erb b/app/views/courses/_set_join.js.erb index 05120a415..32c7dc831 100644 --- a/app/views/courses/_set_join.js.erb +++ b/app/views/courses/_set_join.js.erb @@ -1,8 +1,8 @@ $('#join').replaceWith('<%= escape_javascript join_in_course(course, user) %>'); <% if @state %> <% if @state == 0 %> - alert("加入成功") + alert("加入成功") <% else %> - alert("密码错误") + alert("密码错误") <% end %> <% end %> diff --git a/public/images/bid/special_reward.png b/public/images/bid/special_reward.png new file mode 100644 index 0000000000000000000000000000000000000000..a3a4df59362d4a25d3e9739650b466139c81eb8d GIT binary patch literal 5731 zcmV-p7M$scP)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z3y?`fK~#9!+?i`^99P}Oe{%s(?IKWdk(ZWMRZH0biUdi)aXz7b*@TO@ z%d$xjLP*w1NTpwJ7jgYUY=kHR6=zj0rA3x41Z}w_8?~uJQjv8M$4Ttiv$ogk-JO~9 zewdw;U0;CcEq%j#q>()9IdjhQoag`i|8tHagb)Dk$_nT@YB>+U9e@ZehucWn!fl&B2PWFZHLPAG|u88imKvV zzD((b7rcAJpmO#s<+EpTYk+S@PAw@4paue{;V|WV9t{W`IDoJ$lt2LOzWWG&=tBs{ zK{HMCcpPoVj{hCt8xK4{d3u_LqeqE;_q%Tjo6e0Jl>hu^M5%y@~9+W_!9`I~5 zio3K#>od;~{`kk=^4Jo#P4T(saIakhO~aX;W&Jn5!L=+DO~bi<9ow>`I<_L@u5W&m z(rzoUHS3}S5!qq`gP#0iX83{fh9s-lEKw*WhrE^)cD69w4$+;fB< zf4pv>m2{fYti~b#fZo6y!?CdB4`>~TO0Q5Ebh`0BA-VEJO=!jXm6LD zmQyKK(rExnQ&U^MIG;)}8;#26Hkn*D%UpLiv(YHUOlHf%pfojwYgun9V7;pgeeYhB zaG3n@<6L{_A+)`F(Sf?b0uMeY|1SRe*90GZRQ_L&#Q<37?fvtR@@pK#2Op~pk;WNP$I$7&=8euRuZ+GO5Iw4Sd3sI zft|~FD?KyA;?birJemgvqyqFJaFF>AevnEwE2Xd0C~0YEh#UL&ZyQdssVV{p zy!XA{3S$@uKx=BcC4=#v*c4L0`WNEzCI~A*Rn9;akN;B@S#IeIg3Y+$}p() zh|=Vwlw&cIp?LD-rj*rGHM8)cLs)}@*ts0$$Vgr4^bL=yQ7J&+;6b!^yu&Lz=63F+ zJU`El?|+}B&wf@)bYp8wChMeBDj*JNM(X0-`r6mf-~M)}RA~ClXV8UhQ<sS6Qj3Ru4ZuGK2+1hwJf=c z{&?kVmOwm?QN3!V>MLToYJ7e{(=;$ZV=}pA@uNkfs2v^HufFO57FEjzP#PMrXJ!aK z^iUm}wJkC{%tC)Z%c&H>L;^h)lP0FcVlsY=c${X_q?pOnt>Shi>Oy}%!9;>UJWeo? zVDactT+5Oboo`Sp>9kB?em?(at#a-h`upFHe&2l_VAN_k4QTh=v*ky-Uk3UtHxCS8 z#N*Pm{PNPj_v0O)A(@nNjGj1w(c3E}UKkyvG&Lm^;LOZW_RHF8-Mt+_u4R!=rBEXg zuYXkyfp{FFxA)d+cXXhJLQpJvbM#-R7{-=hWm>9{OUv*ubKTt(Mn`e;d8vZhbWmGD z`es)c9hHt6Oe83tJSoZCSh(z7T%?lC;^yyuD!dY6{G?ufpBr0#bAxf{l zDxBqIA%qaz{NyJ^4#eW8J|*syR=Iewj*y#2j)>LK(Yj~Kr%y}J{&n-n5wZOA)AE_( zN{`~Xau3=l-9kW}Z$6~aOkJnXmTNOL)r%th)O3CzB%w+21 zthTg(>mqC$H=jpsX+gOJLI5p8Lqwi>3Q;I{8|O7&PX7(ZDaA|%r>4vVaH`unVr|W< z;5s@`=DNB>>EcCfQ-?a!7#kDr1f>|T#lwMeTm8+{=m}l;{+al z7^k6un_u_>ZZ&WFTc&~Pcc{|PfMS}24jx3?xf2uxZPzY>k3RZ;0=V>-zYzNHhjFf6 zm4M~Gv~V2CFTI2k2%zrX?J;!joOfu}(Sfimoa@(d=I2@a@sDZw@|V5p#c?P;|2*Z1 z308jeBTq^|X!mX^v$MDxP8xI|{IQRLuA^ugdQT6b{rkPNVHg-aJ#Sh#6@Ky)0=>Q1 z3k!rl@PT^3|8k>T2q>3Pfz47f7>&d zd+((*JuOcSHfH>do9jL~nyO+X5*R%_P^qBq*g=^dds|2gn-oFj_woejDC9rMKb%dr-_`wgnN~~N)tgmAoJBD%h-IS-N(ck$_%76Qt zBtxl&jJwTYollYqXblaZ>!2v;U0sA8e;h^EQCeD9{>oQq%VyE{>_Lr0{znAE>a zS%7crkZx`cXKoG@1+ltH`Q?|XT)2SN-j03l9P7XTy(~jJu3f`Ef1coDj{)#M0|0y& V1DOuNQy>5U002ovPDHLkV1j(nDa-%> literal 0 HcmV?d00001