jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'Homework' into develop

This commit is contained in:
z9hang 2014-11-10 11:20:28 +08:00
parent 606c6a62e4 b707cbae16
commit 6964a787b2
4 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/zipdown_controller.rb
View File

@ -32,7 +32,7 @@ class ZipdownController < ApplicationController
send_file zipfile, :filename => obj.name+".zip", :type => detect_content_type(zipfile) if zipfile send_file zipfile, :filename => obj.name+".zip", :type => detect_content_type(zipfile) if zipfile
rescue Exception => e rescue Exception => e
render file: 'public/no_file_found.html' , :layout => 'course_base' render file: 'public/no_file_found.html'
end end
#下载某一学生的作业的所有文件 #下载某一学生的作业的所有文件

2
app/views/homework_attach/_homework.html.erb
View File

@ -35,7 +35,7 @@
<li class="wscore"> <li class="wscore">
<%= is_student_batch_homework ? l(:label_my_score) : l(:label_student_score)%>: <%= is_student_batch_homework ? l(:label_my_score) : l(:label_student_score)%>:
<span class="c_red"> <span class="c_red">
<%= is_student_batch_homework ? (homework.m_score.nil? ? l(:label_without_score) : homework.m_score) : (homework.s_score.nil? ? l(:label_without_score) : homework.s_score)%> <%= is_student_batch_homework ? (homework.m_score.nil? ? l(:label_without_score) : format("%.2f",homework.m_score)) : (homework.s_score.nil? ? l(:label_without_score) : format("%.2f",homework.s_score))%>
</span> </span>
</li> </li>
<% if is_teacher %> <% if is_teacher %>

164
plugins/redmine_code_review/app/views/code_review/_body_bottom.html.erb
View File

@ -1,82 +1,82 @@
<% <%
# Code Review plugin for Redmine # Code Review plugin for Redmine
# Copyright (C) 2010 Haruyuki Iida # Copyright (C) 2010 Haruyuki Iida
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%> -%>
<% <%
is_target = false is_target = false
if project and controller and project.module_enabled?(:code_review) if project and project.is_a?(Project) and controller and project.module_enabled?(:code_review)
is_target = true is_target = true
is_target = false unless User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, project) is_target = false unless User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, project)
setting = CodeReviewProjectSetting.find(:first, :conditions => ['project_id = ?', project.id]) setting = CodeReviewProjectSetting.find(:first, :conditions => ['project_id = ?', project.id])
is_target = false unless setting is_target = false unless setting
is_target = false if(setting && setting.tracker_id == nil) is_target = false if(setting && setting.tracker_id == nil)
action_name = controller.action_name action_name = controller.action_name
is_target = false unless action_name is_target = false unless action_name
is_target = false unless (controller.class.name == 'RepositoriesController' or controller.class.name == 'AttachmentsController') is_target = false unless (controller.class.name == 'RepositoriesController' or controller.class.name == 'AttachmentsController')
if (is_target == true) if (is_target == true)
context = {:project => project, :controller => controller, :requrest => request} context = {:project => project, :controller => controller, :requrest => request}
%> %>
<% if (controller.class.name == 'AttachmentsController') %> <% if (controller.class.name == 'AttachmentsController') %>
<%= render :partial => 'code_review/change_attachement_view', :locals => context %> <%= render :partial => 'code_review/change_attachement_view', :locals => context %>
<% elsif (action_name == 'show' or action_name == 'revisions') %> <% elsif (action_name == 'show' or action_name == 'revisions') %>
<%= render :partial => 'code_review/change_repository_view', :locals => context %> <%= render :partial => 'code_review/change_repository_view', :locals => context %>
<% elsif (action_name == 'revision') %> <% elsif (action_name == 'revision') %>
<%= render :partial => 'code_review/change_revision_view', :locals => context %> <%= render :partial => 'code_review/change_revision_view', :locals => context %>
<% elsif (action_name == 'diff' or action_name == 'entry' or action_name == 'annotate')%> <% elsif (action_name == 'diff' or action_name == 'entry' or action_name == 'annotate')%>
<%if (controller.params[:rev].blank? or controller.params[:rev] == 'master')%> <%if (controller.params[:rev].blank? or controller.params[:rev] == 'master')%>
<%= render :partial => 'code_review/change_entry_norevision_view', :locals => context %> <%= render :partial => 'code_review/change_entry_norevision_view', :locals => context %>
<% else <% else
changeset = @repository.find_changeset_by_name(controller.params[:rev]) changeset = @repository.find_changeset_by_name(controller.params[:rev])
%> %>
<% unless changeset %> <% unless changeset %>
<%= render :partial => 'code_review/change_entry_norevision_view', :locals => context %> <%= render :partial => 'code_review/change_entry_norevision_view', :locals => context %>
<% else <% else
parameters = request.parameters parameters = request.parameters
rev_to = parameters['rev_to'] unless parameters['rev_to'].blank? rev_to = parameters['rev_to'] unless parameters['rev_to'].blank?
review_id = parameters['review_id'] review_id = parameters['review_id']
rev = parameters['rev'] rev = parameters['rev']
path = parameters['path'] path = parameters['path']
repository_id = @repository.identifier_param if @repository.respond_to?("identifier_param") repository_id = @repository.identifier_param if @repository.respond_to?("identifier_param")
url = url_for :controller => 'code_review', :action => 'update_diff_view', :id => project, :repository_id => repository_id url = url_for :controller => 'code_review', :action => 'update_diff_view', :id => project, :repository_id => repository_id
%> %>
<div id="code_review"> <div id="code_review">
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$('#code_review').load('<%=url%>', { $('#code_review').load('<%=url%>', {
rev: '<%=rev%>', rev: '<%=rev%>',
path:'<%=path%>', path:'<%=path%>',
review_id: '<%=review_id%>', review_id: '<%=review_id%>',
action_type:'<%=action_name%>', action_type:'<%=action_name%>',
rev_to: '<%=rev_to%>'}); rev_to: '<%=rev_to%>'});
}); });
</script> </script>
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>
<% <%
end end
end end
-%> -%>

58
plugins/redmine_code_review/app/views/code_review/_html_header.html.erb
View File

@ -1,30 +1,30 @@
<% <%
# Code Review plugin for Redmine # Code Review plugin for Redmine
# Copyright (C) 2010-2012 Haruyuki Iida # Copyright (C) 2010-2012 Haruyuki Iida
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%> -%>
<% if @project and @project.module_enabled?('code_review') %> <% if @project and @project.is_a?(Project) and @project.module_enabled?('code_review') %>
<% <%
baseurl = Redmine::Utils.relative_url_root baseurl = Redmine::Utils.relative_url_root
-%> -%>
<%= javascript_include_tag(baseurl + "/plugin_assets/redmine_code_review/javascripts/code_review.js") %> <%= javascript_include_tag(baseurl + "/plugin_assets/redmine_code_review/javascripts/code_review.js") %>
<%= javascript_include_tag(baseurl + '/javascripts/jstoolbar/jstoolbar.js') %> <%= javascript_include_tag(baseurl + '/javascripts/jstoolbar/jstoolbar.js') %>
<%= javascript_include_tag(baseurl + '/javascripts/jstoolbar/textile.js') %> <%= javascript_include_tag(baseurl + '/javascripts/jstoolbar/textile.js') %>
<%= javascript_include_tag(baseurl + "/javascripts/jstoolbar/lang/jstoolbar-#{@project.current_language}.js") %> <%= javascript_include_tag(baseurl + "/javascripts/jstoolbar/lang/jstoolbar-#{@project.current_language}.js") %>
<%= stylesheet_link_tag(baseurl + "/plugin_assets/redmine_code_review/stylesheets/code_review.css") %> <%= stylesheet_link_tag(baseurl + "/plugin_assets/redmine_code_review/stylesheets/code_review.css") %>
<%= stylesheet_link_tag(baseurl + "/stylesheets/jstoolbar.css") %> <%= stylesheet_link_tag(baseurl + "/stylesheets/jstoolbar.css") %>
<% end %> <% end %>