diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 052df384e..f83580fba 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -180,6 +180,7 @@ class ProjectsController < ApplicationController
@project = Project.new
@project.safe_attributes = params[:project]
@project.organization_id = params[:organization_id]
+ @project.user_id = User.current.id
if validate_parent_id && @project.save
@project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
# Add current user as a project member if he is not admin
@@ -347,16 +348,27 @@ class ProjectsController < ApplicationController
end
#发送邮件邀请新用户
def invite_members_by_mail
- @is_zhuce =false
- respond_to do |format|
- format.html
- format.js
+ if User.current.member_of?(@project) || User.current.admin?
+ @is_zhuce = false
+ respond_to do |format|
+ format.html
+ format.js
+ end
+ else
+ render_403
end
end
# 邀请Trustie注册用户
def invite_members
- @member ||= @project.members.new
+ if User.current.member_of?(@project) || User.current.admin?
+ @member ||= @project.members.new
+ respond_to do |format|
+ format.html
+ end
+ else
+ render_403
+ end
end
def edit
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index c0d3d2f83..09cc5d59d 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -382,7 +382,7 @@ class CoursesService
end
latest_bid_message = messages.first
unless latest_bid_message.nil?
- latest_course_dynamics << {:type => 2,:time => latest_bid_message.created_on,:message => '最近更新了留言'}#l(:label_recently_updated_message,:locale => current_user.language.nil? ? 'zh':current_user.language)}
+ latest_course_dynamics << {:type => 4,:time => latest_bid_message.created_on,:message => '最近更新了作业'}#l(:label_recently_updated_message,:locale => current_user.language.nil? ? 'zh':current_user.language)}
end
#每个作业中学生最后提交的作业
homeworks = []
diff --git a/app/views/admin/mobile_version.html.erb b/app/views/admin/mobile_version.html.erb
index cc6490f90..2a03ac003 100644
--- a/app/views/admin/mobile_version.html.erb
+++ b/app/views/admin/mobile_version.html.erb
@@ -36,7 +36,7 @@
<% end %>
-<% if @versions.first.attachments.any?%>
+<% if !@versions.first.nil? && @versions.first.attachments.any?%>
<% options = {:author => true, :deletable => true } %>
<%= render :partial => 'attachments/links', :locals => {:attachments => @versions.first.attachments, :options => options, :is_float => true} %>
<% end %>
diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb
index e0c39eb33..73a3a6f2a 100644
--- a/app/views/documents/index.html.erb
+++ b/app/views/documents/index.html.erb
@@ -28,7 +28,7 @@
<% if @grouped.empty? %>
-
+
<%= l(:label_no_data) %>
<% end %>
diff --git a/app/views/files/new.html.erb b/app/views/files/new.html.erb
index be9bcd722..fad22b192 100644
--- a/app/views/files/new.html.erb
+++ b/app/views/files/new.html.erb
@@ -1,5 +1,5 @@
-
<%=l(:label_attachment_new)%>
+ <%= l(:label_course_file) %>
<%= error_messages_for 'attachment' %>
@@ -8,11 +8,10 @@
<% if @versions.any? %>
-<%= select_tag "version_id", content_tag('option', '') +
- options_from_collection_for_select(@versions, "id", "name") %>
+ <%= select_tag "version_id", content_tag('option', '') + options_from_collection_for_select(@versions, "id", "name") %>
<% end %>
-<%= render :partial => 'attachments/form' %>
+<%= render :partial => 'attachments/form' %>
<%= submit_tag l(:button_add) %>
<% end %>
diff --git a/app/views/issues/_newissue_index.html.erb b/app/views/issues/_newissue_index.html.erb
index b89ba41a2..4b282aa8f 100644
--- a/app/views/issues/_newissue_index.html.erb
+++ b/app/views/issues/_newissue_index.html.erb
@@ -2,7 +2,7 @@
问题跟踪
- <% if @project.enabled_modules.where("name = 'issue_tracking'").count > 0 %>
+ <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
<% if User.current.member_of?(@project) %>
<%= link_to l(:label_issue_new), {:controller => 'issues', :action => 'new', :copy_from => nil}, :param => :project_id, :caption => :label_issue_new,
diff --git a/app/views/kaminari/_gap.html.erb b/app/views/kaminari/_gap.html.erb
index a45dfdaa0..01b6cc640 100644
--- a/app/views/kaminari/_gap.html.erb
+++ b/app/views/kaminari/_gap.html.erb
@@ -5,4 +5,6 @@
per_page: number of items to fetch per page
remote: data-remote
-%>
-
+
+<%= raw(t 'views.pagination.truncate') %>
+
\ No newline at end of file
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 262aa2f69..8d39b6926 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -112,11 +112,11 @@
<% if @project.project_type == 0 %>
<%= l(:label_project_score)%> :
- <%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects',
- :action => 'show_projects_score',
- :remote => true,
- :id => @project.id },
- :style => "color: #EC6300;")%>
+ <%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects',
+ :action => 'show_projects_score',
+ :remote => true,
+ :id => @project.id },
+ :style => "color: #EC6300;") %>
<% end %>