Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts: app/views/layouts/base_projects.html.erb
This commit is contained in:
commit
aee81e8e44
|
@ -8,11 +8,11 @@
|
|||
<%= link_to l(:project_module_wiki), project_wiki_path(@project) %>
|
||||
<% end %>
|
||||
</li>
|
||||
<li>
|
||||
<% unless @project.enabled_modules.where("name = 'code_review'").empty? %>
|
||||
<%= link_to l(:project_module_code_review), {controller: 'code_review', action: 'index', id: @project.id} %>
|
||||
<% end %>
|
||||
</li>
|
||||
<!--<li>-->
|
||||
<!--<%# unless @project.enabled_modules.where("name = 'code_review'").empty? %>-->
|
||||
<!--<%#= link_to l(:project_module_code_review), {controller: 'code_review', action: 'index', id: @project.id} %>-->
|
||||
<!--<%# end %>-->
|
||||
<!--</li>-->
|
||||
<!--<li>-->
|
||||
<!--<%# unless @project.enabled_modules.where("name = 'calendar'").empty? %>-->
|
||||
<!--<%#= link_to l(:project_module_calendar),project_calendar_path(@project) %>-->
|
||||
|
@ -23,21 +23,21 @@
|
|||
<!--<%#= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>-->
|
||||
<!--<%# end %>-->
|
||||
<!--</li>-->
|
||||
<li>
|
||||
<% unless @project.enabled_modules.where("name = 'documents'").empty? %>
|
||||
<%= link_to l(:project_module_documents), project_documents_path(@project) %>
|
||||
<% end %>
|
||||
</li>
|
||||
|
||||
<!--<li>-->
|
||||
<!--<%# unless @project.enabled_modules.where("name = 'documents'").empty? %>-->
|
||||
<!--<%#= link_to l(:project_module_documents), project_documents_path(@project) %>-->
|
||||
<!--<%# end %>-->
|
||||
<!--</li>-->
|
||||
<!---->
|
||||
<li>
|
||||
<%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%>
|
||||
</li>
|
||||
<li>
|
||||
<% unless @project.enabled_modules.where("name = 'dts'").empty? %>
|
||||
<%= link_to l(:project_module_dts) ,share_show_path(@project) %>
|
||||
<% end %>
|
||||
</li>
|
||||
<!--<li>-->
|
||||
<!--<%# unless @project.enabled_modules.where("name = 'dts'").empty? %>-->
|
||||
<!--<%#= link_to l(:project_module_dts) ,share_show_path(@project) %>-->
|
||||
<!--<%# end %>-->
|
||||
<!--</li>-->
|
||||
|
||||
|
|
Loading…
Reference in New Issue