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

app/views/forums/show.html.erb

@@ -58,15 +58,15 @@
         if(!check_memo_name()){
             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();
             $("#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();
         }
-        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();
-        }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();
         }
     }

app/views/memos/edit.html.erb

@@ -2,7 +2,7 @@
 <script>
 
   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 ){
               $("#error").html('主题不能超过50个字符').show();
               return;
@@ -13,11 +13,11 @@
 //          }
           memo_content.sync();
           $("#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();
-      }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();
-      }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();
       }
   }

app/views/projects/_development_group.html.erb

@@ -49,7 +49,7 @@
     <% end %>
     <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) %>
-        <%= 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 %>
   </div>
 <% end %>

lib/tasks/sync_sigle_rep.rake

@@ -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

lib/trustie/gitlab/sync.rb

@@ -76,6 +76,7 @@ module Trustie
                             wall_enabled: false,
                             issues_enabled: false,
                             snippets_enabled: false,
+                            merge_requests_enabled: true,
                             public: false,
                             user_id: gid,
                             import_url: import_url

public/javascripts/course.js

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