From 68bd1098319f4388cd8b821b0664f419a2af63e0 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 29 Jan 2016 17:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=AD=90=E5=9F=9F=E5=90=8D=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E6=89=B9?=
 =?UTF-8?q?=E5=87=86=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/setting.html.erb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index b9b2f9b4c..a91a079ef 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -58,6 +58,11 @@
           <div class="w607 fr">http：//
             <input type="text" name="organization[domain]" id="domain" value="<%= @organization.domain%>" 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 @organization.domain.present? %>
+                <span>(已批准)</span>
+            <% elsif OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).count > 0 %>
+                <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>
           <!--class="c_green f12" 您的申请已提交，系统会以消息的形式通知您结果 -->
         </div>