Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
This commit is contained in:
commit
992d2be6e4
|
@ -13,7 +13,7 @@
|
||||||
<% else %>
|
<% else %>
|
||||||
<p>
|
<p>
|
||||||
<span><%=l(:label_course_doing)%>(<%=@memberships_doing.count%>)</span>
|
<span><%=l(:label_course_doing)%>(<%=@memberships_doing.count%>)</span>
|
||||||
<%= link_to"#{l(:label_course_new)}",{:controller=>'projects',:action=>'new', :course => 1, :project_type => 1}, :class => 'icon icon-add' %>
|
<%= link_to"#{l(:label_course_new)}",{:controller=>'projects',:action=>'new', :course => 1, :project_type => 1}, :class => 'icon icon-add' if @user == User.current %>
|
||||||
</p>
|
</p>
|
||||||
<div>
|
<div>
|
||||||
<%= render :partial => 'course_form', :locals => {:memberships => @memberships_doing}%>
|
<%= render :partial => 'course_form', :locals => {:memberships => @memberships_doing}%>
|
||||||
|
|
Loading…
Reference in New Issue