Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/controllers/open_source_projects_controller.rb

@@ -12,6 +12,7 @@ class OpenSourceProjectsController < ApplicationController
   # GET /open_source_projects
   # GET /open_source_projects.json
   def index
+    
     @app_dir = params[:app_dir]
     @language = params[:language]
     @created_at = params[:created_at]
@@ -25,6 +26,8 @@ class OpenSourceProjectsController < ApplicationController
 
     @open_source_projects =  @open_source_projects.offset(@os_project_pages.offset).limit(@os_project_pages.per_page)
     
+    @bugs = BugToOsp.order('created_at desc').limit(8)
+
     # @open_source_projects = OpenSourceProject.all
 
     respond_to do |format|

app/helpers/open_source_projects_helper.rb

@@ -46,4 +46,12 @@ module OpenSourceProjectsHelper
     end
     description
   end
+  
+  def show_description_of_bug(bug)
+    description = bug.description
+    if description.nil? || description == ''
+      description = bug.open_source_project.name + l(:label_bug)
+    end
+    description
+  end
 end

app/views/open_source_projects/index.html.erb

@@ -148,15 +148,17 @@ li {
         <div class="fixed"></div>
         <div id ="buglist" class="li_list" style="margin-top:10px;margin-left:10px">
           <ul style="list-style-type: square;">
-            <li><span class="li_time">[DDoS漏洞]</span><a href="/vuldb/ssvid-62261" title="Cobbler 2.4.x - 2.6.x 本地文件包含">Cobbler 2.4.x - 2.6.x 本地文件包含</a></li>
+          	<% @bugs.each do |bug| %>
+          	<li><span class="li_time">[<%= show_description_of_bug(bug) %>]</span><%= link_to bug.bug.subject, bug.bug.url, :target => '_blank' %>
+          		<a href="/vuldb/ssvid-62261" title="Cobbler 2.4.x - 2.6.x 本地文件包含">Cobbler 2.4.x - 2.6.x 本地文件包含</a></li>
+          	<% end %>
+          	
+            <!-- <li><span class="li_time">[DDoS漏洞]</span><a href="/vuldb/ssvid-62261" title="Cobbler 2.4.x - 2.6.x 本地文件包含">Cobbler 2.4.x - 2.6.x 本地文件包含</a></li>
 
             <li><span class="li_time">[OpenSSL漏洞]</span><a href="/vuldb/ssvid-62260" title="Ruby OpenSSL CA私钥伪造漏洞">Ruby OpenSSL CA私钥伪造漏洞</a></li>
 
             <li style="color: red"><span class="li_time">[远程溢出漏洞]</span><a href="/vuldb/ssvid-62259" title="Adobe Flash Player 整数堆栈下溢远程命令执行">Adobe Flash Player 整数堆栈下溢远程命令执行</a></li>
 
-           <!--  <li><span class="li_time">14-05-07</span><a href="/vuldb/ssvid-62258" title="PHPDISK phpdisk_del_process.php SQL注入漏洞">PHPDISK phpdisk_del_process.php SQL注入漏洞</a></li> -->
-
-            <!-- <li><span class="li_time">[OpenSSL漏洞]</span><a href="/vuldb/ssvid-62257" title="BEESCMS 3.4 order_save.php SQL注入漏洞">BEESCMS 3.4 order_save.php SQL注入漏洞</a></li> -->
            
             <li ><span class="li_time">[SQL注入漏洞]</span><a href="/vuldb/ssvid-62256" title="Apache/NGINX 下 PHP-FPM 或者 PHP-CGI 拒绝服务漏洞">Apache/NGINX 下 PHP-FPM 拒绝服务漏洞</a></li>
 
@@ -167,6 +169,7 @@ li {
             <li ><span class="li_time">[OpenSSL漏洞]</span><a href="/vuldb/ssvid-62245" title="Watchguard Fireware XTM OpenSSL TLS心跳信息泄漏漏洞">Watchguard Fireware XTM OpenSSL TLS心跳...</a></li>
 
             <li style="color: red"><span class="li_time">[OpenSSL漏洞]</span><a href="/vuldb/ssvid-62244" title="SAP Sybase SQL Anywhere OpenSSL TLS泄漏漏洞">SAP Sybase SQL Anywhere OpenSSL TLS</a></li>
+          --> 
           </ul>
         </div>
       </div>

app/views/open_source_projects/showbug.html.erb

@@ -32,7 +32,7 @@
 <!--modified by huang-->
 <% #= link_to '发布帖子', new_forum_memo_path(@forum), :class => 'icon icon-add' %>
 <span>
-	<%= link_to l(:label_memo_new_from_forum), new_open_source_project_relative_memo_path(@open_source_project), :class => 'icon icon-add',
+	<%#= link_to l(:label_memo_new_from_forum), new_open_source_project_relative_memo_path(@open_source_project), :class => 'icon icon-add',
             :onclick => 'showAndScrollTo("add-memo", "memo_subject"); return false;' if User.current.logged? %>
 </span>