Organ

app/controllers/org/board/members_controller.rb

@@ -1,5 +1,4 @@
 class Org::Board::MembersController < Org::Board::BaseController
-
   def index
     @organs = current_user.members.includes(:organ).where.not(organ_id: nil).group_by(&:organ)
     if @organs.blank?
@@ -19,41 +18,32 @@ def near
   end
 
   def create
-    @member = current_user.members.build
+    @member = current_user.members.build(owned: true)
     @member.assign_attributes member_params
 
     if @member.save
-      render 'create', locals: { return_to: params[:return_to].presence || my_members_url }
+      render 'create', locals: { return_to: params[:return_to].presence || my_organs_url }
     else
       render :new, locals: { model: @member }, status: :unprocessable_entity
     end
   end
 
   private
-  def set_organs
-    @organs = Organ.where(official: false).limit(5)
-    @member = current_user.members.build
-    @organ = @member.build_organ
-    @identities = current_user.available_account_identities.pluck(:identity).map { |i| [i, i] }
-  end
 
-  def set_member
-    @member = current_user.members.find params[:id]
-  end
+    def set_organs
+      @organs = Organ.where(official: false).limit(5)
+      @member = current_user.members.build
+      @organ = @member.build_organ
+      @identities = current_user.available_account_identities.pluck(:identity).map { |i| [i, i] }
+    end
 
-  def member_params
-    params.fetch(:member, {}).permit(
-      :name,
-      :organ_id,
-      :identity,
-      :profession,
-      :attendance_number,
-      :next_on_time,
-      :next_off_time,
-      :experience,
-      :avatar,
-      organ_attributes: {}
-    )
-  end
+    def set_member
+      @member = current_user.members.find params[:id]
+    end
 
+    def member_params
+      params.fetch(:member, {}).permit(:name, :organ_id, :identity, :profession, :attendance_number,
+                                       :next_on_time, :next_off_time, :experience, :avatar,
+                                       organ_attributes: {})
+    end
 end

app/controllers/org/board/organs_controller.rb

@@ -26,9 +26,7 @@ def create
     @member = current_user.members.build(member_params)
     @member.build_organ(organ_params)
 
-    unless @member.save
-      render :new, locals: { model: @member }, status: :unprocessable_entity
-    end
+    render :new, locals: { model: @member }, status: :unprocessable_entity unless @member.save
   end
 
   def show
@@ -40,40 +38,31 @@ def edit
   def update
     @organ.assign_attributes(organ_params)
 
-    unless @organ.save
-      render :edit, locals: { model: @organ }, status: :unprocessable_entity
-    end
+    render :edit, locals: { model: @organ }, status: :unprocessable_entity unless @organ.save
   end
 
   def destroy
     @organ.destroy
   end
 
   private
-  def set_member
-    @member = current_user.members.find params[:member_id]
-  end
 
-  def set_organ
-    @organ = Organ.find(params[:id])
-  end
+    def set_member
+      @member = current_user.members.find params[:member_id]
+    end
 
-  def member_params
-    p = params.fetch(:member, {}).permit(
-      :identity
-    )
-    p.merge! owned: true
-    unless p[:identity]
-      p.merge! identity: current_account.identity
+    def set_organ
+      @organ = Organ.find(params[:id])
     end
-    p
-  end
 
-  def organ_params
-    params.fetch(:member, {}).fetch(:organ_attributes, {}).permit(
-      :name,
-      :logo
-    )
-  end
+    def member_params
+      p = params.fetch(:member, {}).permit(:identity)
+      p.merge! owned: true
+      p.merge! identity: current_account.identity unless p[:identity]
+      p
+    end
 
+    def organ_params
+      params.fetch(:member, {}).fetch(:organ_attributes, {}).permit(:name, :logo)
+    end
 end

app/models/rails_org/organ.rb

@@ -17,10 +17,10 @@ module RailsOrg::Organ
     has_taxons :area
     belongs_to :area, optional: true
 
-    has_many :supports, -> { where(department_id: nil) }, dependent: :destroy
-    has_many :departments, dependent: :destroy
-    has_many :members, dependent: :destroy
-    has_many :super_job_titles, dependent: :destroy
+    has_many :supports, -> { where(department_id: nil) }, dependent: :delete_all
+    has_many :departments, dependent: :delete_all
+    has_many :members, dependent: :delete_all
+    has_many :super_job_titles, dependent: :delete_all
     accepts_nested_attributes_for :members
 
     has_one_attached :logo

app/models/rails_org/user.rb

@@ -7,6 +7,16 @@ module RailsOrg::User
     after_save :copy_avatar_to_members, if: -> { attachment_changes['avatar'].present? }
   end
 
+  # 拥有的组织
+  def owned_organs
+    organs.where(members: { owned: true })
+  end
+
+  # 是否拥有指定组织
+  def owned_organ?(organ)
+    owned_organs.include?(organ)
+  end
+
   def available_account_identities
     accounts.where.not(identity: members.pluck(:identity)).confirmed
   end
@@ -22,5 +32,4 @@ def init_avatar_to_members
       member.avatar.attach avatar_blob if avatar_blob
     end
   end
-
 end

app/views/org/board/members/index.html.erb

@@ -1,22 +1,24 @@
 <div class="ui three cards">
-  <% @members.each do |member| %>
-  <div class="card">
-    <div class="content">
-      <div>
-        <i class="fas fa-user"></i>
-        <span class="ui grey text"><%= member.name %></span>
-        <span class="ui green text"><%= member.identity %></span>
+  <% if @members %>
+    <% @members.each do |member| %>
+    <div class="card">
+      <div class="content">
+        <div>
+          <i class="fas fa-user"></i>
+          <span class="ui grey text"><%= member.name %></span>
+          <span class="ui green text"><%= member.identity %></span>
+        </div>
+      </div>
+      <div class="extra content">
+        <p>
+          <span><%= member.organ.address %></span>
+          <%= link_to member.organ.name, login_my_member_path(member), method: :patch, remote: true, class: 'ui mini button' %>
+          <span><%= member.departments.first&.full_name %></span>
+          <%= image_tag member.organ.logo.variant(resize_to_limit: [150, 150]), class: 'right floated mini ui image' if member.organ.logo.attached? %>
+        </p>
       </div>
     </div>
-    <div class="extra content">
-      <p>
-        <span><%= member.organ.address %></span>
-        <%= link_to member.organ.name, login_my_member_path(member), method: :patch, remote: true, class: 'ui mini button' %>
-        <span><%= member.departments.first&.full_name %></span>
-        <%= image_tag member.organ.logo.variant(resize_to_limit: [150, 150]), class: 'right floated mini ui image' if member.organ.logo.attached? %>
-      </p>
-    </div>
-  </div>
+    <% end %>
   <% end %>
   <div class="card">
     <div class="content">

app/views/org/board/organs/_form.html.erb

@@ -1,8 +1,10 @@
 <%= form_with model: @member, url: my_organs_path do |f| %>
   <%= render 'shared/error_messages', target: @member %>
+
   <%= f.fields :organ do |ef| %>
-    <%= ef.text_field :name, required: true %>
-    <%= ef.file_field :logo %>
+    <%= ef.text_field :name, required: true, class: 'input is-small', label: { class: 'label is-small' } %>
+    <%= ef.file_field :logo, class: 'input is-small', label: { class: 'label is-small' } %>
   <% end %>
-  <%= f.submit %>
+
+  <%= f.submit class: 'button is-primary is-small' %>
 <% end %>

app/views/org/board/organs/index.html.erb

@@ -1,16 +1,20 @@
 <div class="hero-body">
   <% @organs.each do |organ, members| %>
     <div class="box">
-      <div class="media is-middle">
+      <div class="media is-middle" style="height: 48px;">
         <div class="media-left">
           <%= image_tag organ.logo.variant(resize_to_limit: [150, 150]), class: 'image is-48x48' if organ.logo.attached? %>
         </div>
         <div class="media-content">
           <strong><%= organ.name %></strong>
         </div>
         <div class="media-right">
+          <% if current_user.owned_organ?(organ) %>
+            <%= link_to '删除', my_organ_path(organ), method: :delete, data: { confirm: '确认删除？' }, class: 'button is-danger is-light is-small' %>
+          <% end %>
         </div>
       </div>
+
       <% members.each do |member| %>
         <div class="card">
           <div class="card-content">
@@ -34,7 +38,7 @@
   <% end %>
   <div class="media">
     <div class="media-content">
-      <%= link_to new_my_member_path, remote: true do %>
+      <%= link_to new_my_member_path, remote: true, class: 'button is-primary is-small' do %>
         <i class="fas fa-plus"></i><span><%= t('org.my.organs.new.title') %></span>
       <% end %>
     </div>

config/locales/zh.attributes.yml

@@ -62,6 +62,7 @@ zh:
         limit_wechat: 允许微信数
         limit_office: 允许分支机构数
         parent_uuid: 上级机构编码
+        logo: 封面
       organ_grant:
         organ_id: 机构
         role_ids: 权限