we_bridge_rails_engine_orgs 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90d86a527e42296ac2627cda31dfbbef062a20f9
-  data.tar.gz: 8e9378ed2c4fe872247ae834270469e7b3b0a14c
+  metadata.gz: 3ed538429408a472c71a28894c57902ecb32edf7
+  data.tar.gz: f40da9c37dbd11b0bf39a8d5e153cdbcc8edaefb
 SHA512:
-  metadata.gz: 03886baf24544957a4e3af5c965be77e35b8cedb620bed187842727ceb07d60207ebc829b31aa758e9160b73299c133beaf3f605b9c24ce1bb2476f49a28a2ef
-  data.tar.gz: 4443c8d932e085e4b5e8220088704626c82cf4c39a7749d6f2f68ccd325b9918780c3223f435e5f8dcf5c78e262f9b9740f95bec99573dd20d1bab2edfb1b69a
+  metadata.gz: 6c0fb690cb3ef788cb9668fb14fcaa8293266f0ee5aa7cdc7e0a1abfaafb535f3a2285f545036f68e911ee3f1f0e1f3b55a45f6cfd53dfead5bac2af4dd2abfa
+  data.tar.gz: 4d57d9219c54401e170a4823b07585375c31b9c462ff38f48c8fc10eb96afb71eda22641dd11faaf3bf7f47993346ef2cbd26dc18eddd57504a18aaf49f89eb1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    we_bridge_rails_engine_orgs (0.1.0)
+    we_bridge_rails_engine_orgs (0.1.1)
       actionview-helpers-auto_tag_helper
       activerecord-mlang
       we_bridge-auto_view_helper

data/app/controllers/concerns/org_common.rb

@@ -0,0 +1,17 @@
+module OrgCommon
+  extend ActiveSupport::Concern
+  included do
+    # class_attribute :org_id_key
+    class << self; attr_accessor :org_id_key; end
+    before_action { @org = Org.find(params[self.class.org_id_key || :org_id]) }
+    before_action only: [:edit,:update,:destroy] do
+      login_required
+      # check_current_user(@record)
+    end
+  end
+
+  def record_params
+    super.tap{|rtn| rtn[:org_id] ||= @org.id }
+  end
+
+end

data/app/controllers/org_activities_controller.rb

@@ -1,8 +1,5 @@
 class OrgActivitiesController < ApplicationController
   include WeBridge::AutoViewHelper::Controller
   set_model OrgActivity
-  before_action only: [:edit,:update,:destroy] do
-    login_required
-    # check_current_user(@record)
-  end
+  include OrgCommon
 end

data/app/controllers/org_branch_types_controller.rb

@@ -1,9 +1,5 @@
 class OrgBranchTypesController < ApplicationController
   include WeBridge::AutoViewHelper::Controller
   set_model OrgBranchType
-  before_action { @org = Org.find params[:org_id] }
-  before_action only: [:edit,:update,:destroy] do
-    login_required
-    # check_current_user(@record)
-  end
+  include OrgCommon
 end

data/app/controllers/org_branches_controller.rb

@@ -1,9 +1,5 @@
 class OrgBranchesController < ApplicationController
   include WeBridge::AutoViewHelper::Controller
   set_model OrgBranch
-  before_action { @org = Org.find params[:org_id] }
-  before_action only: [:edit,:update,:destroy] do
-    login_required
-    # check_current_user(@record)
-  end
+  include OrgCommon
 end

data/app/controllers/org_director_types_controller.rb

@@ -1,8 +1,5 @@
 class OrgDirectorTypesController < ApplicationController
   include WeBridge::AutoViewHelper::Controller
   set_model OrgDirectorType
-  before_action only: [:edit,:update,:destroy] do
-    login_required
-    # check_current_user(@record)
-  end
+  include OrgCommon
 end

data/app/controllers/org_directors_controller.rb

@@ -1,8 +1,5 @@
 class OrgDirectorsController < ApplicationController
   include WeBridge::AutoViewHelper::Controller
   set_model OrgDirector
-  before_action only: [:edit,:update,:destroy] do
-    login_required
-    # check_current_user(@record)
-  end
+  include OrgCommon
 end

data/app/controllers/org_member_tags_controller.rb

@@ -1,8 +1,5 @@
 class OrgMemberTagsController < ApplicationController
   include WeBridge::AutoViewHelper::Controller
   set_model OrgMemberTag
-  before_action only: [:edit,:update,:destroy] do
-    login_required
-    # check_current_user(@record)
-  end
+  include OrgCommon
 end

data/app/controllers/org_member_types_controller.rb

@@ -1,8 +1,5 @@
 class OrgMemberTypesController < ApplicationController
   include WeBridge::AutoViewHelper::Controller
   set_model OrgMemberType
-  before_action only: [:edit,:update,:destroy] do
-    login_required
-    # check_current_user(@record)
-  end
+  include OrgCommon
 end

data/app/controllers/org_members_controller.rb

@@ -1,8 +1,5 @@
 class OrgMembersController < ApplicationController
   include WeBridge::AutoViewHelper::Controller
   set_model OrgMember
-  before_action only: [:edit,:update,:destroy] do
-    login_required
-    # check_current_user(@record)
-  end
+  include OrgCommon
 end

data/app/controllers/orgs_controller.rb

@@ -3,6 +3,5 @@ class OrgsController < ApplicationController
   set_model Org
   before_action only: [:edit,:update,:destroy] do
     login_required
-    # check_current_user(@record)
   end
 end

data/app/models/org_activity.rb

@@ -4,5 +4,12 @@ class OrgActivity < ActiveRecord::Base
   belongs_to :org
   include ActiveRecord::Mlang
   include ActionView::Helpers::AutoTagHelper::FormInfo
-  # set_accessible_attrs :email,:user_img_url,:lang_id
+  set_accessible_attrs :position
+  def <=>(other)
+    self.position <=> (other.try(:position) || self.position + 1)
+  end
+
+  def __display__
+    self.text.label
+  end
 end

data/app/models/org_activity_text.rb

@@ -3,5 +3,5 @@ require 'activerecord/mlang'
 class OrgActivityText < ActiveRecord::Base
   include ActiveRecord::Mlang::Text
   include ActionView::Helpers::AutoTagHelper::FormInfo
-  # set_accessible_attrs :email,:user_img_url,:lang_id
+  set_accessible_attrs :label,:description
 end

data/app/models/org_branch.rb

@@ -6,4 +6,8 @@ class OrgBranch < ActiveRecord::Base
   include ActiveRecord::Mlang
   include ActionView::Helpers::AutoTagHelper::FormInfo
   set_accessible_attrs :org_branch_type_id
+
+  def __display__
+    self.text.name + self.org_branch_type.__display__
+  end
 end

data/app/models/org_branch_text.rb

@@ -3,6 +3,6 @@ require 'activerecord/mlang'
 class OrgBranchText < ActiveRecord::Base
   include ActiveRecord::Mlang::Text
   include ActionView::Helpers::AutoTagHelper::FormInfo
-  # set_accessible_attrs :email,:user_img_url,:lang_id
+  set_accessible_attrs :name
 end
 

data/app/models/org_branch_type.rb

@@ -4,7 +4,9 @@ class OrgBranchType < ActiveRecord::Base
   belongs_to :org
   include ActiveRecord::Mlang
   include ActionView::Helpers::AutoTagHelper::FormInfo
-  # set_accessible_attrs :email,:user_img_url,:lang_id
+  set_accessible_attrs :position
+  set_input_options :position, min: 0
+
   def __display__
     self.text.label
   end

data/app/models/org_branch_type_text.rb

@@ -3,7 +3,7 @@ require 'activerecord/mlang'
 class OrgBranchTypeText < ActiveRecord::Base
   include ActiveRecord::Mlang::Text
   include ActionView::Helpers::AutoTagHelper::FormInfo
-  # set_accessible_attrs :email,:user_img_url,:lang_id
+  set_accessible_attrs :label, :desc
 end
 
 

data/app/models/org_director_type.rb

@@ -4,8 +4,18 @@ class OrgDirectorType < ActiveRecord::Base
   belongs_to :org
   include ActiveRecord::Mlang
   include ActionView::Helpers::AutoTagHelper::FormInfo
-  # set_accessible_attrs :email,:user_img_url,:lang_id
+  set_accessible_attrs :position, :limit
+  validates :limit, length: {minimum: 1}
+  set_input_options :limit, min: 0
+
+  validates :position, length: {minimum: 0}
+  set_input_options :position, min: 0
+
   def <=>(other)
     self.position <=> (other.try(:position) || self.position + 1)
   end
+
+  def __display__
+    self.text.try(:label).to_s
+  end
 end

data/app/models/org_director_type_text.rb

@@ -3,6 +3,6 @@ require 'activerecord/mlang'
 class OrgDirectorTypeText < ActiveRecord::Base
   include ActiveRecord::Mlang::Text
   include ActionView::Helpers::AutoTagHelper::FormInfo
-  # set_accessible_attrs :email,:user_img_url,:lang_id
+  set_accessible_attrs :label, :desc
 end
 

data/app/models/org_member.rb

@@ -8,12 +8,27 @@ class OrgMember < ActiveRecord::Base
 
   include ActiveRecord::Mlang
   include ActionView::Helpers::AutoTagHelper::FormInfo
-  set_accessible_attrs :lang_id, :handle_name, :byear, :bmonth, :bday, :entried_on, :sex, :expire_at, :retired_on
+  set_accessible_attrs :lang_id, :org_director_type_id, :org_member_type_id, :handle_name, :byear, :bmonth, :bday, :entried_on, :sex, :expire_at, :retired_on
   set_input_options :byear, min: Time.now.year - 120, max: Time.now.year
   set_input_options :bmonth, min: 1, max: 12
   set_input_options :bday, min: 1, max: 31
   set_input_options :sex, min: -1, max: 1
 
+  def others
+    self.class.where(org_id: self.org_id).where.not(id: self.id)
+  end
+
+  before_save do
+    if changed_attributes[:org_director_type_id]
+      limit = OrgDirectorType.select(:limit).where(id: self.org_director_type_id).first.limit
+      if limit < 1 || others.where(org_director_type_id: self.org_director_type_id).count < limit
+        # no problem
+      else
+        raise WeBridge::Exceptions::ForbiddenError
+      end
+    end
+  end
+
   def <=>(other)
     [:director_type, :member_type, :entried_on, :created_at].inspect(nil){|rtn,m| rtn || (self.try(m) <=> other.try(m)).to_i.nonzero? }
   end
@@ -23,6 +38,6 @@ class OrgMember < ActiveRecord::Base
   end
 
   def real_name
-    self.text(self.lang_id || I18n.locale).try(:name).to_s
+    self.text(self.lang_id).try(:name).to_s
   end
 end

data/app/models/org_member_tag.rb

@@ -4,5 +4,11 @@ class OrgMemberTag < ActiveRecord::Base
   belongs_to :org
   include ActiveRecord::Mlang
   include ActionView::Helpers::AutoTagHelper::FormInfo
-  # set_accessible_attrs :email,:user_img_url,:lang_id
+
+  def self.editable_columns(); [] ;  end
+
+  def __display__
+    self.text.label
+  end
+
 end

data/app/models/org_member_tag_text.rb

@@ -3,5 +3,5 @@ require 'activerecord/mlang'
 class OrgMemberTagText < ActiveRecord::Base
   include ActiveRecord::Mlang::Text
   include ActionView::Helpers::AutoTagHelper::FormInfo
-  # set_accessible_attrs :email,:user_img_url,:lang_id
+  set_accessible_attrs :label
 end

data/app/models/org_member_type.rb

@@ -4,8 +4,13 @@ class OrgMemberType < ActiveRecord::Base
   belongs_to :org
   include ActiveRecord::Mlang
   include ActionView::Helpers::AutoTagHelper::FormInfo
-  # set_accessible_attrs :email,:user_img_url,:lang_id
+  set_accessible_attrs :position
   def <=>(other)
     self.position <=> (other.try(:position) || self.position + 1)
   end
+
+  def __display__
+    self.text.label
+  end
+
 end

data/app/models/org_member_type_text.rb

@@ -3,6 +3,6 @@ require 'activerecord/mlang'
 class OrgMemberTypeText < ActiveRecord::Base
   include ActiveRecord::Mlang::Text
   include ActionView::Helpers::AutoTagHelper::FormInfo
-  # set_accessible_attrs :email,:user_img_url,:lang_id
+  set_accessible_attrs :label, :desc
 end
 

data/app/views/common/_show.html.builder

@@ -1 +1,9 @@
-show_common @record, show_path: url_for(action: :show, id: @record.id), back_path: url_for(action: :index), edit_path: url_for(action: :edit, id: @record.id)
+markup do |m|
+  m.div do
+    m.ul do
+      m.li do
+        m.a "Show members", href: url_for(controller: :org_members, action: :index, org_id: (@org || @record).id)
+      end
+    end
+  end
+end + show_common(@record, show_path: url_for(action: :show, id: @record.id), back_path: url_for(action: :index), edit_path: url_for(action: :edit, id: @record.id))

data/app/views/org_activities/show.html.builder

@@ -1,9 +1 @@
-markup do |m|
-  m.div do
-    m.ul do
-      m.li do
-        m.a "Show members", href: url_for(controller: :org_members, action: :index, org_id: @record.id)
-      end
-    end
-  end
-end + render('common/show')
+render('common/show')

data/app/views/org_branch_types/show.html.builder

@@ -1,9 +1 @@
-markup do |m|
-  m.div do
-    m.ul do
-      m.li do
-        m.a "Show members", href: url_for(controller: :org_members, action: :index, org_id: @record.id)
-      end
-    end
-  end
-end + render('common/show')
+render('common/show')

data/app/views/org_branches/show.html.builder

@@ -1,9 +1 @@
-markup do |m|
-  m.div do
-    m.ul do
-      m.li do
-        m.a "Show members", href: url_for(controller: :org_members, action: :index, org_id: @record.id)
-      end
-    end
-  end
-end + render('common/show')
+render('common/show')

data/app/views/org_director_types/show.html.builder

@@ -1,9 +1 @@
-markup do |m|
-  m.div do
-    m.ul do
-      m.li do
-        m.a "Show members", href: url_for(controller: :org_members, action: :index, org_id: @record.id)
-      end
-    end
-  end
-end + render('common/show')
+render('common/show')

data/app/views/org_directors/show.html.builder

@@ -1,9 +1 @@
-markup do |m|
-  m.div do
-    m.ul do
-      m.li do
-        m.a "Show members", href: url_for(controller: :org_members, action: :index, org_id: @record.id)
-      end
-    end
-  end
-end + render('common/show')
+render('common/show')

data/app/views/org_member_tags/show.html.builder

@@ -1,9 +1 @@
-markup do |m|
-  m.div do
-    m.ul do
-      m.li do
-        m.a "Show members", href: url_for(controller: :org_members, action: :index, org_id: @record.id)
-      end
-    end
-  end
-end + render('common/show')
+render('common/show')

data/app/views/org_member_types/show.html.builder

@@ -1,9 +1 @@
-markup do |m|
-  m.div do
-    m.ul do
-      m.li do
-        m.a "Show members", href: url_for(controller: :org_members, action: :index, org_id: @record.id)
-      end
-    end
-  end
-end + render('common/show')
+render('common/show')

data/app/views/org_members/show.html.builder

@@ -1,9 +1 @@
-markup do |m|
-  m.div do
-    m.ul do
-      m.li do
-        m.a "Show members", href: url_for(controller: :org_members, action: :index, org_id: @record.id)
-      end
-    end
-  end
-end + render('common/show')
+render('common/show')

data/db/migrate/20150812025526_create_orgs.rb

@@ -25,13 +25,14 @@ class CreateOrgs < ActiveRecord::Migration
 
     create_table :org_activities do |t|
       t.integer :org_id , null: false
+      t.integer :position, null: false, default: 0
       t.timestamps null: false
     end
 
     create_table :org_activity_texts do |t|
       t.integer :parent_id, null: false
       t.integer :lang_id, null: false
-      t.string :label, null: false
+      t.string :label
       t.text   :description
       t.timestamps null: false
     end