From f79b2cda948a2a3908cd37b468e440e683f2cce2 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 15 Sep 2015 15:18:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81=E5=85=B3?= =?UTF-8?q?=E8=81=94=E9=A1=B9=E7=9B=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/student_work_helper.rb | 9 ++++----- app/views/student_work/new.html.erb | 11 +++++++++++ .../users/_user_homework_attachment.html.erb | 6 +++--- app/views/users/_user_homework_list.html.erb | 3 +++ public/images/homepage_icon.png | Bin 11280 -> 12533 bytes public/javascripts/new_user.js | 6 ++++++ public/stylesheets/new_user.css | 10 +++++++++- 7 files changed, 36 insertions(+), 9 deletions(-) diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb index bff997ba4..aa359e273 100644 --- a/app/helpers/student_work_helper.rb +++ b/app/helpers/student_work_helper.rb @@ -2,17 +2,16 @@ include UserScoreHelper module StudentWorkHelper + #获取当前用户的项目列表 def user_projects_option - cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" - memberships = User.current.memberships.all(:conditions => cond) - projects = memberships.map(&:project) + projects = User.current.projects.visible not_have_project = [] - not_have_project << Setting.please_chose + not_have_project << "没有可选项目,请直接为本作品创建一个项目" not_have_project << 0 type = [] type << not_have_project projects.each do |project| - if project != nil + if project option = [] option << project.name option << project.id diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb index 85c23f300..de9ede9ff 100644 --- a/app/views/student_work/new.html.erb +++ b/app/views/student_work/new.html.erb @@ -75,6 +75,17 @@ <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %> +
ja^a)H$`s* z0?n?s6S-wC=Gnw&IzUgs@TAg%SI%kumxKj;xJO>S&eD_g* zzG}>I{zY#Tll MQ-`P~}YFBs)71z;_2NnbjDTCA6_ zS!Hc)$bz8<$(6?tDdK hDyX S2>we2G0-u+TB7az*Z%?8)&c$i delta 8263 zcmZ8{cT|&0(04+lNR?isT#ED_gwU0abO8ZDhzfzwizor%A#zcg2u3LZLT}QP5)niK zQbdGYK&dLBNRdtukorB|`SLfer$Jl)u !^#q25*x|^(i!#I?gq>tb zwTeo#nyW`y=xvPoc}!TMP&3-p!95Hi8}lw>5d$!YG8R8F`0MX3c7s_4(U8B>5C~ zqF}S=xKh^h2g}8#N)J<-F^FMoI7yHqNf~MUa+n=%O?v=K# *jUlgXcwME;AY^ QK^CE8 z*y0sJ?(nnKqdS6&$5(el6#Ysu_oRVMf2LFE*nrsn@GR&!D<6ZiW(jnO#f@eM`Ve+G zzJ^LB8+2=mJ_)y$9g6u#u$A6X*))RY9I10L9y_M598nu=Lv|I1fM6w|+u$aQ^CR?c zZ@nh@l{Mh|G+9_!qPgA->gzLcm%lJNeM!*jf#jau8Cc3CurtQ5+DfaP0h&c`AIDs3 z>Ky&O=v_D~FFT~a8sL>f#}*+Ce^+Sh6F7O;iv5I*U9^AyrHDERg29x4n$TK3E)#DG z3q_Az!^$~glCRMS-HqXq9W1^Seg4$0UGAl!TP+O6vl+ynym#iLt*~(B5Cjt!)+JNH zRGbI=8Ty*!bF{(;#Ls4znLhq~gXD(1-BZ6s>LpFr?|7eZF~;lJj@Qp2tjz~O8(!Dd zPks~jmoZCl`|?X-k1Uc#S*hvLJyx|};qDMIOs$?I7vsRy&)21RlDY4Lwt*{6AHV(~ zNxqI$-n=8Xq6-zwQhe<5bfKE21ln8$!f8!%bDt N71~2 z{k_u1@7ss0{Rd9zQP2&jcx+}vHT7(8D|%R0fHD5v)$#3&MSBpFmVRBZpm**Zf;K =w z*5~Eh@oJ@p0k01IEkvZwXF}WQY9$YaUQ|56IdNJ);cm2PFJJ!SFzdwCs?Tiox(t@k z^`V=-_LB7yR;`|dr+N9Mg9uD YikL|jK^=1yIYX{xOHQos(_$W4;2)I8G`qFVFW E7K!r$448}glRKooF4PBzFlfrFGxLS$~EmE*X$OBAUM3) zoh{K6Z2vT)A3K6|-Ac~;GER)H4Vc2ka&9u&S!Ez@ C**e9Qqo* zI`lCbD9ZDjx@$jSI7OU>#TW{Azmu?D^!ji7rK%s3;DHiTLZ^1N_w38WY}Kw<<)d-~ zrr 6+-h3DLtviNktn%8?VSf>(Hj$2?rs&A&JFQ9Pfo=M_y$x2J~rm4IX zRQJZ1P>RR70Akm23k;^&-}Gp%Zvy~7a(_&Q-&9jV)6I^Zx}or0uV;Dh3wux9%>yN| zy;zk6Z_Sg6$ Sdl5>@w1f{nB}TCNrmJ~ zQ4pU{o+4&i -7L<#68xXK5t9jI!JR|=wH&CBJwuZw#seFpX&rfj8_r?(^GAd z*%VQ~&wG)hJdB=!QE^N-Rm!neSD#3Ka`uR6UjXqX{2MiPadTt7PMseO-BjNM{HIQ$ z-f3qd@+|(d*2kvBUJhh)-(Rff)L~HVS^d#=p_4UhfX)O&=OU`@B=dfdtfh+$;20vE zX6+qj5!Ls90F(LVMlg@~xjq=!J !0j_kABeiv%zvy54tb2$$0W|$GdygV>Tf)V^N#rWkS%k9Gkbm zC6-MR+iJ(7Ed)iAF2%wA+*=Z<=QvCm62-y$3wK|M4@lT9FkDzo>b@lfb%J_prc&cO z6`zG{-&PJ*-F)OMPmKH1ygsPbJDX|G7pFh+L9KulAV!EvSo5G$yYiE~=_xD}2g)hU zhU{ul>xkkL>)u kj%FjklSAXh^*U)$qvt z*InR>>ye7>8Y1;0ktq>pjK6GxzoA;9=|0Tx3mjt~@9|H#ZH8qr<7WeYDf+`1CzF%R z687hpDjybmbSRDK37%db2sUrH@cto7f6LpGj<7+>+?zR<2ISvO=;)EqpeG}X^@|D1 z>HRT#mc+G%ft>P!3@oBjV5=8Kua#O{zXsIUo^F=*ZuOiQi=;kZ4Ons{ry{>Ji2qbt zVlvgeWvYl-x@cVU=>SpmGQ}R46Mo{_k4m9`>i%VSh2I$-2Q^$AshZY;sMoIa;%UFg z*9dtB926;?+uRk>&{g&NLi-U>GcrCt&WYe?*ZDX^(%26(Ii&%%e|_iA+3CtpI|k;E z%KJ@S%MWHhPiyT9uf)* lOf*Lb)RahA!;uH_P<{$3WJw? R bK4 zq3;j(pr227@zMM1?s8(qQi0)4#>XQgkwzvqN9v(o$Eyc@ gJ-~da{hxt=8-?`HLdt uco=zky=*c$meyYu z*&s_|qKlKNsvLdp+< #sj; zP;`Bcay~F%($sfKDRZMPmiVD{tu5~WA=It0atKpKF5N%fk`Pa%_U!EJxhm2(mtkgN z3#q@!Q!`cEaa{lK{BHiRc1?Ef&PC$#;hR1k!=&%MfK&e-l+qd%T>xs6O|%d6cN?p# zRHDx39j|QYh8xv7{`+ ?UGd7kN z ($Go=rpVrchLW>`CP^LJ_nN o`f`3DZX`6=x8C9FK#5q4>K3ivTTrg<=we6={>*U-F34N!yVnA&^0oGw$P^pAo@ zUUJv6SqOnJid$rx@(ef-TmGfJ|LsHFUA?g6g^8WM7!g!!+v{dr!SXGiFT2o(r=_y0 zk+Y~o@eo-PLGj*`Q4yOM5wl3g=&`VIT_ -d3Fs0c?hVK0-C-=hM%6 ze?$-=_%psSU4QKrJXjv_RLn$hl;7$`2R_Y