Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/helpers/issues_helper.rb

@@ -80,7 +80,7 @@ module IssuesHelper
       issuetype << "support fl"
       issuetype << "支持"
     elsif value == "功能" || value == 2
-      issuetype << "function fl"
+      issuetype << "issues-function fl"
       issuetype << "功能"
     else
       issuetype << "weekly fl"

app/models/attachment.rb

@@ -28,6 +28,7 @@ class Attachment < ActiveRecord::Base
   belongs_to :attachmentstype,  :foreign_key => "attachtype",:primary_key => "id"
   # 被ForgeActivity虚拟关联
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
+  has_many :forwards, :as => :from
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # end

app/models/forward.rb

@@ -0,0 +1,4 @@
+class Forward < ActiveRecord::Base
+  validates_presence_of :from_id, :from_type, :to_id, :to_type
+  belongs_to :from, :polymorphic => true
+end

app/views/issues/_detail.html.erb

@@ -8,7 +8,7 @@
       <% when 1%>
           <span class="issues fl" title="缺陷"></span>
       <% when 2%>
-          <span class="function fl" title="功能"></span>
+          <span class="issues-function fl" title="功能"></span>
       <% when 3%>
           <span class="support fl" title="支持"></span>
       <% when 4%>

app/views/organizations/setting.html.erb

@@ -59,9 +59,10 @@
           <div class="w607 fr">http：//
             <input type="text" name="organization[domain]" id="domain" value="<%= domain.nil? ? '' : domain.subname %>" class="orgUrlInput" />
             .trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;" onclick="apply_subdomain(<%= @organization.id %>,$('#domain').val());">申请</a>
-            <% if domain.present? and OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content == domain.subname %>
+            <% record = OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first %>
+            <% if domain.present? and record.present? and record.content == domain.subname %>
                 <span>(已批准)</span>
-            <% elsif OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).count > 0 %>
+            <% elsif record %>
                 <span>(您申请了子域名<%= OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content %>，还未批准)</span>
             <% end %>
             <p class="c_green f12" id="apply_hint" ></p></div>

app/views/users/_project_issue.html.erb

@@ -18,7 +18,7 @@
           <% when 1%>
             <span class="issues fl" title="缺陷"></span>
         <% when 2%>
-            <span class="function fl" title="功能"></span>
+            <span class="issues-function fl" title="功能"></span>
         <% when 3%>
             <span class="support fl" title="支持"></span>
         <% when 4%>

db/migrate/20160224032046_create_forwards.rb

@@ -0,0 +1,15 @@
+class CreateForwards < ActiveRecord::Migration
+  def up
+    create_table :forwards do|t|
+      t.integer :from_id
+      t.string :from_type
+      t.integer :to_id
+      t.string :to_type
+      t.timestamp :created_at
+    end
+  end
+
+  def down
+    drop_table :forwards
+  end
+end

public/stylesheets/new_user.css

@@ -1405,7 +1405,7 @@ span.at a{color:#269ac9;text-decoration: none;}
 .issues{ background:url(../images/public_icon.png) -66px 5px no-repeat; width:18px; height:21px;}
 .duty{ background:url(../images/public_icon.png) -66px -18px no-repeat; width:18px; height:21px;}
 .support{ background:url(../images/public_icon.png) -66px -45px no-repeat; width:18px; height:21px;}
-.function{ background:url(../images/public_icon.png) -66px -70px no-repeat; width:18px; height:21px;}
+.issues-function{ background:url(../images/public_icon.png) -66px -70px no-repeat; width:18px; height:21px;}
 .weekly{ background:url(../images/public_icon.png) -66px -95px no-repeat; width:18px; height:21px;}
 
 /*资源发送到org*/

public/stylesheets/project.css

@@ -200,12 +200,6 @@ a.pro_mes_w_news{ height:20px; float:right;display:block; color:#999999;}
 .pro_info_box ul li{ height:24px;}
 .pro_info_p{color:#0781b4 !important; float:left;  width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
 .edit_pro_box{overflow:hidden;display:none; margin-bottom:30px; border-bottom:1px dashed #CCC; padding-bottom:10px;}
-/*问题状态图片*/
-.issues{ background:url(../images/public_icon.png) -66px 5px no-repeat; width:16px; height:21px;}
-.duty{ background:url(../images/public_icon.png) -66px -18px no-repeat; width:16px; height:21px;}
-.support{ background:url(../images/public_icon.png) -66px -45px no-repeat; width:16px; height:21px;}
-.function{ background:url(../images/public_icon.png) -66px -70px no-repeat; width:16px; height:21px;}
-.weekly{ background:url(../images/public_icon.png) -66px -95px no-repeat; width:16px; height:21px;}
 /****翻页***/
 ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 ul.wlist li{float: left;}
@@ -1084,7 +1078,7 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c
 .issues{ background:url(../images/public_icon.png) -66px 5px no-repeat; width:18px; height:21px;}
 .duty{ background:url(../images/public_icon.png) -66px -18px no-repeat; width:18px; height:21px;}
 .support{ background:url(../images/public_icon.png) -66px -45px no-repeat; width:18px; height:21px;}
-.function{ background:url(../images/public_icon.png) -66px -70px no-repeat; width:18px; height:21px;}
+.issues-function{ background:url(../images/public_icon.png) -66px -70px no-repeat; width:18px; height:21px;}
 .weekly{ background:url(../images/public_icon.png) -66px -95px no-repeat; width:18px; height:21px;}
 
 .upload_img img{max-width: 100%;}