hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Browse Source
dev_xiangzheng
cxt 10 years ago
parent 1133b35169 7e5585bdd2
commit c6f365c1ac
8 changed files with 59 additions and 36 deletions
Show Stats Download Patch File Download Diff File

44
app/services/courses_service.rb
Unescape View File

@ -320,15 +320,15 @@ class CoursesService
#如果加入角色为学生 并且当前是学生 #如果加入角色为学生 并且当前是学生
if params[:role] == "10" && roleName == "Student" if params[:role] == "10" && roleName == "Student"
@state = 3 @state = 3
#如果加入的角色为老师，并且当前已经是老师 #如果加入的角色为老师，并且当前已经是老师
elsif params[:role] == "9" && roleName == "Teacher" elsif params[:role] == "9" && roleName == "Teacher"
@state = 8 @state = 8
#如果加入的角色教辅并且当前为教辅 #如果加入的角色教辅并且当前为教辅
elsif params[:role] == "7" && roleName == "TeachingAsistant" elsif params[:role] == "7" && roleName == "TeachingAsistant"
@state = 9 @state = 9
elsif roleName == "Manager" elsif roleName == "Manager"
@state = 10 @state = 10
#如果加入角色为教师或者教辅，并且当前是学生，或者是要成为教辅，当前不是教辅，或者要成为教师，当前不是教师。那么要发送请求 #如果加入角色为教师或者教辅，并且当前是学生，或者是要成为教辅，当前不是教辅，或者要成为教师，当前不是教师。那么要发送请求
elsif (params[:role] != "10" && roleName == "Student") || (params[:role] == "7" && roleName != "TeachingAsistant" ) || (params[:role] == "9" && roleName != "Teacher" ) elsif (params[:role] != "10" && roleName == "Student") || (params[:role] == "7" && roleName != "TeachingAsistant" ) || (params[:role] == "9" && roleName != "Teacher" )
#如果已经发送过消息了，那么就要给个提示 #如果已经发送过消息了，那么就要给个提示
if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0 ").count != 0 if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0 ").count != 0
@ -338,7 +338,7 @@ class CoursesService
CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0) CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
@state = 6 @state = 6
end end
#如果加入角色是学生，但是是当前课程的教师或者教辅 #如果加入角色是学生，但是是当前课程的教师或者教辅
elsif params[:role] == "10" && roleName != "Student" elsif params[:role] == "10" && roleName != "Student"
member.role_ids = [params[:role]] member.role_ids = [params[:role]]
member.save member.save
@ -349,26 +349,26 @@ class CoursesService
@state = 1 @state = 1
end end
else else
if params[:course_password] == course.password if params[:course_password] == course.password
if params[:role] == "10" || params[:role] == nil if params[:role] == "10" || params[:role] == nil
members = [] members = []
members << Member.new(:role_ids => [10], :user_id => current_user.id) members << Member.new(:role_ids => [10], :user_id => current_user.id)
course.members << members course.members << members
StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id]) StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
@state = 0 @state = 0
else
#如果已经发送过消息了，那么就要给个提示
if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0
@state = 7
else
Mailer.run.join_course_request(course, User.current, params[:role])
CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
@state = 6
end
end
else else
@state = 1 #如果已经发送过消息了，那么就要给个提示
if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0
@state = 7
else
Mailer.run.join_course_request(course, User.current, params[:role])
CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
@state = 6
end
end end
else
@state = 1
end
end end
end end
else else

8
app/views/forums/show.html.erb
Unescape View File

@ -58,15 +58,15 @@
if(!check_memo_name()){ if(!check_memo_name()){
return; return;
} }
if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() != "" ){ if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
memo_content.sync(); memo_content.sync();
$("#new_memo").submit(); $("#new_memo").submit();
}else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() == ""){ }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
$("#error").html("主题和内容不能为空").show(); $("#error").html("主题和内容不能为空").show();
} }
else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() != "" ){ else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
$("#error").html("主题不能为空").show(); $("#error").html("主题不能为空").show();
}else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().val().trim() == ""){ }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
$("#error").html("内容不能为空").show(); $("#error").html("内容不能为空").show();
} }
} }

8
app/views/memos/edit.html.erb
Unescape View File

@ -2,7 +2,7 @@
<script> <script>
function check_and_submit(){ function check_and_submit(){
if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() != "" ){ if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
if($("textarea[name='memo[subject]']").val().trim().length > 50 ){ if($("textarea[name='memo[subject]']").val().trim().length > 50 ){
$("#error").html('主题不能超过50个字符').show(); $("#error").html('主题不能超过50个字符').show();
return; return;
@ -13,11 +13,11 @@
// } // }
memo_content.sync(); memo_content.sync();
$("#edit_memo").submit(); $("#edit_memo").submit();
}else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() != "" ){ }else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
$("#error").html("主题不能为空").show(); $("#error").html("主题不能为空").show();
}else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() == ""){ }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
$("#error").html("内容不能为空").show(); $("#error").html("内容不能为空").show();
}else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() == ""){ }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
$("#error").html("主题和内容不能为空").show(); $("#error").html("主题和内容不能为空").show();
} }
} }

2
app/views/projects/_development_group.html.erb
Unescape View File

@ -49,7 +49,7 @@
<% end %> <% end %>
<a class="subnav_num">(<%= @project.repositories.count %>)</a> <a class="subnav_num">(<%= @project.repositories.count %>)</a>
<% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) && rep_is_gitlab?(@project) %> <% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) && rep_is_gitlab?(@project) %>
<%= link_to "+"+l(:project_module_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories') , :class => "subnav_green" %> <%= link_to "+"+l(:project_gitlab_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories') , :class => "subnav_green" %>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>

0
lib/tasks/update_rep_if_fault.rake → lib/tasks/gitlab_to_git.rake
Unescape View File

22
lib/tasks/sync_sigle_rep.rake
Unescape View File

@ -0,0 +1,22 @@
#coding=utf-8
namespace :sync_rep do
desc "sync some projects which just have sigle repository"
task :sigle => :environment do
projects = Project.all
projects.each do |project|
# 针对类型为Git并且只有一个版本库的项目
if project.repositories && project.repositories.count == 1 && project.repositories.first.type == "Repository::Git"
rep = project.repositories.first
s = Trustie::Gitlab::Sync.new
s.sync_project(project, path: rep.identifier, import_url: rep.url)
rep.type = 'Repository::Gitlab'
rep.save
puts "*************************************"
puts project.id
puts rep.id
puts rep.identifier
end
end
end
end

3
lib/trustie/gitlab/sync.rb
Unescape View File

@ -66,7 +66,7 @@ module Trustie
if opt[:password] if opt[:password]
import_url.sub('@', ":#{opt[:password]}@") import_url.sub('@', ":#{opt[:password]}@")
end end
# import url http://xianbo_trustie2:1234@repository.trustie.net/xianbo/trustie2.git # import url http://xianbo_trustie2:1234@repository.trustie.net/xianbo/trustie2.git
# can use password # can use password
gproject = self.g.create_project(path, gproject = self.g.create_project(path,
@ -76,6 +76,7 @@ module Trustie
wall_enabled: false, wall_enabled: false,
issues_enabled: false, issues_enabled: false,
snippets_enabled: false, snippets_enabled: false,
merge_requests_enabled: true,
public: false, public: false,
user_id: gid, user_id: gid,
import_url: import_url import_url: import_url

8
public/javascripts/course.js
Unescape View File

@ -176,7 +176,7 @@ function regexTopicSubject() {
function regexTopicDescription() function regexTopicDescription()
{ {
var name = message_content_editor.html(); var name = message_content_editor.html();
if(name.length ==0) if(message_content_editor.isEmpty())
{ {
$("#message_content_span").text("描述不能为空"); $("#message_content_span").text("描述不能为空");
$("#message_content_span").css('color','#ff0000'); $("#message_content_span").css('color','#ff0000');
@ -282,7 +282,7 @@ function regexTitle()
function regexDescription() function regexDescription()
{ {
var name = news_description_editor.html(); var name = news_description_editor.html();
if(name.length ==0) if(news_description_editor.isEmpty())
{ {
$("#description_notice_span").text("描述不能为空"); $("#description_notice_span").text("描述不能为空");
$("#description_notice_span").css('color','#ff0000'); $("#description_notice_span").css('color','#ff0000');
@ -327,7 +327,7 @@ function submitComment()
function newsReplyVerify() { function newsReplyVerify() {
var content = comment_editor.html(); var content = comment_editor.html();
if(content.length == 0) { if(comment_editor.isEmpty()) {
$("#add_reply_news").text("评论不能为空"); $("#add_reply_news").text("评论不能为空");
$("#add_reply_news").css('color', '#ff0000'); $("#add_reply_news").css('color', '#ff0000');
return false; return false;
@ -356,7 +356,7 @@ function course_board_canel_message_replay()
function MessageReplayVevify() { function MessageReplayVevify() {
var content = message_content_editor.html();//$.trim($("#message_content").val()); var content = message_content_editor.html();//$.trim($("#message_content").val());
if (content.length == 0) { if (message_content_editor.isEmpty()) {
$("#message_content_span").text("回复不能为空"); $("#message_content_span").text("回复不能为空");
$("#message_content_span").css('color', '#ff0000'); $("#message_content_span").css('color', '#ff0000');
return false; return false;

Write Preview
Loading…
Cancel
Save