Merge branch 'develop' of github.com:amooma/GS5 into develop

4 files changed, 31 insertions, 3 deletions

diff --git a/db/migrate/20130124105613_add_default_company_name_to_gemeinschaft_setup.rb b/db/migrate/20130124105613_add_default_company_name_to_gemeinschaft_setup.rb
new file mode 100644
index 0000000..46b4884
--- /dev/null
+++ b/db/migrate/20130124105613_add_default_company_name_to_gemeinschaft_setup.rb
@@ -0,0 +1,6 @@
+class AddDefaultCompanyNameToGemeinschaftSetup < ActiveRecord::Migration
+  def change
+    add_column :gemeinschaft_setups, :default_company_name, :string
+    add_column :gemeinschaft_setups, :default_system_email, :string
+  end
+end
diff --git a/db/migrate/20130124123128_add_mobile_max_string_length_parameter.rb b/db/migrate/20130124123128_add_mobile_max_string_length_parameter.rb
new file mode 100644
index 0000000..6bbac04
--- /dev/null
+++ b/db/migrate/20130124123128_add_mobile_max_string_length_parameter.rb
@@ -0,0 +1,11 @@
+class AddMobileMaxStringLengthParameter < ActiveRecord::Migration
+  def up
+    GsParameter.create(:name => 'MOBILE_MAX_STRING_LENGTH', :section => 'HTML', :value => '8', :class_type => 'Integer', :description => 'Max length of a string on a mobile devise.')
+    GsParameter.create(:name => 'DESKTOP_MAX_STRING_LENGTH', :section => 'HTML', :value => '30', :class_type => 'Integer', :description => 'Max length of a string on a desktop devise.')
+  end
+
+  def down
+  	GsParameter.where(:name => 'MOBILE_MAX_STRING_LENGTH').destroy_all
+  	GsParameter.where(:name => 'DESKTOP_MAX_STRING_LENGTH').destroy_all
+  end
+end
diff --git a/db/migrate/20130124125238_add_default_user_groups_for_new_users.rb b/db/migrate/20130124125238_add_default_user_groups_for_new_users.rb
new file mode 100644
index 0000000..d2700d6
--- /dev/null
+++ b/db/migrate/20130124125238_add_default_user_groups_for_new_users.rb
@@ -0,0 +1,9 @@
+class AddDefaultUserGroupsForNewUsers < ActiveRecord::Migration
+  def up
+    GsParameter.create(:name => 'DEFAULT_USER_GROUPS_IDS', :section => 'New user defaults', :value => "---\n- 3\n", :class_type => 'YAML', :description => 'Default user group ids for a new user.')
+  end
+
+  def down
+  	GsParameter.where(:name => 'DEFAULT_USER_GROUPS_IDS').destroy_all
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 649e022..8258394 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130122121100) do
+ActiveRecord::Schema.define(:version => 20130124125238) do
 
   create_table "access_authorizations", :force => true do |t|
     t.string   "access_authorizationable_type"
@@ -535,9 +535,11 @@ ActiveRecord::Schema.define(:version => 20130122121100) do
     t.integer  "sip_domain_id"
     t.integer  "country_id"
     t.integer  "language_id"
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
     t.string   "default_area_code"
+    t.string   "default_company_name"
+    t.string   "default_system_email"
   end
 
   create_table "gs_cluster_sync_log_entries", :force => true do |t|