From 8ead573872e00b47a50f7b8b935bc6196be5fed2 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 13 Jan 2016 09:56:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=AE=BE=E7=BD=AEurl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb   | 23 +++++++++++--------
 app/views/org_subfields/create.js.erb         | 18 +++++++++------
 .../organizations/_subfield_list.html.erb     |  2 +-
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index df81ccaff..3f781c4cc 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -1,16 +1,21 @@
 class OrgSubfieldsController < ApplicationController
   def create
-    @subfield = OrgSubfield.create(:name => params[:name])
-    @organization = Organization.find(params[:organization_id])
-    @organization.org_subfields << @subfield
-    if !params[:sub_dir].blank?
-      sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+
-            "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
-      if SubfieldSubdomainDir.find_by_sql(sql).count == 0
-        SubfieldSubdomainDir.create(:org_subfield_id => @org_subfield.id, :name => params[:sub_dir])
+    if OrgSubfield.where("organization_id=#{params[:organization_id]} and name=?",params[:name]).count == 0
+      @res = true
+      @subfield = OrgSubfield.create(:name => params[:name])
+      @organization = Organization.find(params[:organization_id])
+      @organization.org_subfields << @subfield
+      if !params[:sub_dir].blank?
+        sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+
+              "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
+        if SubfieldSubdomainDir.find_by_sql(sql).count == 0
+          SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir])
+        end
       end
+      @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type])
+    else
+      @res = false
     end
-    @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type])
   end
 
   def show
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index 345c8f60f..61ac95f71 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -1,7 +1,11 @@
-$("#org_subfield_list").html("");
-$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',
-    :locals => {:default_fields => @organization.org_subfields.where("field_type='default'"),
-    :subfields => @organization.org_subfields.where("field_type != 'default'") }) %>");
-$("#sub_field_left_lists").html("");
-$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
-$("#subfield_name").val("");
\ No newline at end of file
+<% if @res %>
+    $("#org_subfield_list").html("");
+    $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',
+        :locals => {:default_fields => @organization.org_subfields.where("field_type='default'"),
+        :subfields => @organization.org_subfields.where("field_type != 'default'") }) %>");
+    $("#sub_field_left_lists").html("");
+    $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
+    $("#subfield_name").val("");
+<% else %>
+    $("#subfield_name").val("");
+<% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index b8af1e85e..19e9eb3c2 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -27,7 +27,7 @@
       </li>
       <li class="orgListStatus">新增</li>
       <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
-      <li class="orgListUser hidden">publications</li>
+      <li class="orgListUser hidden"><%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %></li>
       <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
       <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"设为隐藏":"设为可见" %></a>
       <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr10" %>