we_bridge_rails_engine_orgs 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56d4b90dbd21685a0ed9835dd2d04b1a343fcf9b
-  data.tar.gz: 7354e5f72ca0c1c2ef2bf06e31141e7389d33457
+  metadata.gz: 1e985cea2955b94b2e16aa73f72f65574ad26b09
+  data.tar.gz: 8e1691d52ba938472ad6c8686f8a237e8af52cd5
 SHA512:
-  metadata.gz: 328e502c7ca42ff1ae3f27b2df5059ddebb3ceae7f0ad5b9ebfc6994678d0825fae6cc2e9c18403995104785727b9d9f969bc486ee0a4ee6763cade7315327ed
-  data.tar.gz: cccc72c5002815ed2b99d67bb1f8e45136279bbb2901752251faad523c4b9f8dc1ec464c7a44fa124d91541a5509c01ceb165151b41f4f8d4028fe0715bd959a
+  metadata.gz: 86bfd633a0a335878a4f2b3441e56d9b7646e7ed6def982db3391b5487e965ed5456d749e3544e2b9f1b4eee1b070a13bbe948be4e7db94e5e52b33ebdb24a72
+  data.tar.gz: 3b23a207085e01da274b47dba912083eaa583b1be27e58260f99539391fc5214fc1db17f5bedf774f2436d06cd434be2df78b82d8377bbc893ff860456647fce

data/Gemfile.lock

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

data/app/models/org_branch.rb

@@ -5,7 +5,8 @@ class OrgBranch < ActiveRecord::Base
   belongs_to :org_branch_type
   include ActiveRecord::Mlang
   include ActionView::Helpers::AutoTagHelper::FormInfo
-  set_accessible_attrs :org_branch_type_id
+  set_accessible_attrs :org_branch_type_id, :position
+  default_scope ->(){ order :position, :id }
 
   def __display__
     self.text.name + self.org_branch_type.__display__

data/app/models/org_branch_type.rb

@@ -6,6 +6,7 @@ class OrgBranchType < ActiveRecord::Base
   include ActionView::Helpers::AutoTagHelper::FormInfo
   set_accessible_attrs :position
   set_input_options :position, min: 0
+  default_scope ->(){ order :position, :id }
 
   def __display__
     self.text.label

data/db/migrate/20151203153522_add_branch_position.rb

@@ -0,0 +1,5 @@
+class AddBranchPosition < ActiveRecord::Migration
+  def change
+    add_column :org_branches, :position, :integer, null: false, default: 0
+  end
+end

data/lib/we_bridge_rails_engine_orgs/version.rb

@@ -1,3 +1,3 @@
 module WeBridgeRailsEngineOrgs
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151009112829) do
+ActiveRecord::Schema.define(version: 20151203153522) do
 
   create_table "lang_texts", force: :cascade do |t|
     t.integer  "parent_id",  null: false
@@ -90,10 +90,11 @@ ActiveRecord::Schema.define(version: 20151009112829) do
   end
 
   create_table "org_branches", force: :cascade do |t|
-    t.integer  "org_branch_type_id", null: false
-    t.integer  "org_id",             null: false
-    t.datetime "created_at",         null: false
-    t.datetime "updated_at",         null: false
+    t.integer  "org_branch_type_id",             null: false
+    t.integer  "org_id",                         null: false
+    t.datetime "created_at",                     null: false
+    t.datetime "updated_at",                     null: false
+    t.integer  "position",           default: 0, null: false
   end
 
   create_table "org_director_type_texts", force: :cascade do |t|

data/spec/dummy/log/development.log

@@ -26054,3 +26054,170 @@ Completed 200 OK in 157ms (Views: 148.4ms | ActiveRecord: 4.6ms)
   OrgMember Load (0.3ms)  SELECT "org_members".* FROM "org_members" WHERE "org_members"."org_id" = ?  [["org_id", 1]]
   Org Load (1.2ms)  SELECT  "orgs".* FROM "orgs"  ORDER BY "orgs"."id" ASC LIMIT 1
   OrgMember Load (0.2ms)  SELECT "org_members".* FROM "org_members" WHERE "org_members"."org_id" = ?  [["org_id", 1]]
+  OrgBranch Load (1.9ms)  SELECT "org_branches".* FROM "org_branches"  ORDER BY "org_branches"."position" ASC
+  ActiveRecord::SchemaMigration Load (0.5ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddBranchPosition (20151203153522)
+   (0.2ms)  begin transaction
+   (0.6ms)  ALTER TABLE "org_branches" ADD "position" integer NOT NULL
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.6ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddBranchPosition (20151203153522)
+   (0.2ms)  begin transaction
+   (0.6ms)  ALTER TABLE "org_branches" ADD "position" integer DEFAULT 0 NOT NULL
+  SQL (0.6ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20151203153522"]]
+   (1.1ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_lang_texts_on_parent_id_and_lang_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_lang_texts_on_parent_id_and_lang_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_langs_on_code' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_langs_on_code' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_org_activity_texts_on_lang_id_and_parent_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_org_activity_texts_on_lang_id_and_parent_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_org_branch_member_mappings' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_org_branch_member_mappings' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_org_branch_texts' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_org_branch_texts' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_org_branch_type_texts' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_org_branch_type_texts' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_org_director_type_texts_on_parent_id_and_lang_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_org_director_type_texts_on_parent_id_and_lang_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_org_member_tag_mappings' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_org_member_tag_mappings' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_org_member_tag_texts_on_lang_id_and_parent_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_org_member_tag_texts_on_lang_id_and_parent_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_org_member_texts_on_lang_id_and_parent_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_org_member_texts_on_lang_id_and_parent_id' AND type='index'
+
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_org_member_type_texts_on_lang_id_and_parent_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_org_member_type_texts_on_lang_id_and_parent_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_org_texts' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_org_texts' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='idx_person_name_texts' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='idx_person_name_texts' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_person_names_on_person_id_and_revision' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_person_names_on_person_id_and_revision' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_person_texts_on_parent_id_and_lang_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_person_texts_on_parent_id_and_lang_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_sessions_on_updated_at' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_sessions_on_updated_at' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_sessions_on_session_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_sessions_on_session_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_user_accounts_on_uid' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_user_accounts_on_uid' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_user_texts_on_lang_id_and_parent_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_user_texts_on_lang_id_and_parent_id' AND type='index'
+
+  OrgBranch Load (2.5ms)  SELECT "org_branches".* FROM "org_branches"  ORDER BY "org_branches"."position" ASC
+  OrgBranch Load (1.1ms)  SELECT "org_branches".* FROM "org_branches"  ORDER BY "org_branches"."position" ASC, "org_branches"."id" ASC

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: we_bridge_rails_engine_orgs
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Shinjiro Itagaki
@@ -300,6 +300,7 @@ files:
 - db/migrate/20150812025526_create_orgs.rb
 - db/migrate/20150814183339_create_org_branches_table.rb
 - db/migrate/20151009112829_delete_names.rb
+- db/migrate/20151203153522_add_branch_position.rb
 - lib/tasks/we_bridge_rails_engine_orgs_tasks.rake
 - lib/we_bridge_rails_engine_orgs.rb
 - lib/we_bridge_rails_engine_orgs/engine.rb