diff --git a/app/models/group/root.rb b/app/models/group/circle.rb similarity index 73% rename from app/models/group/root.rb rename to app/models/group/circle.rb index df5b880..f044124 100644 --- a/app/models/group/root.rb +++ b/app/models/group/circle.rb @@ -1,12 +1,11 @@ # encoding: utf-8 -# TODO: rename class to specific name and change all references -class Group::Root < ::Group +class Group::Circle < ::Group self.layer = true # TODO: define actual child group types - children Group::Root + children Group::Circle, Group::HelpCircle ### ROLES diff --git a/app/models/group/help_circle.rb b/app/models/group/help_circle.rb new file mode 100644 index 0000000..88e1f8c --- /dev/null +++ b/app/models/group/help_circle.rb @@ -0,0 +1,6 @@ +# encoding: utf-8 + +# TODO: rename class to specific name and change all references +class Group::HelpCircle < ::Group + self.layer = true +end diff --git a/app/models/lit/group.rb b/app/models/lit/group.rb index ed22692..fd6c0ec 100644 --- a/app/models/lit/group.rb +++ b/app/models/lit/group.rb @@ -8,7 +8,7 @@ module Lit::Group # self.used_attributes += [:website, :bank_account, :description] # self.superior_attributes = [:bank_account] - root_types Group::Root + root_types Group::Circle end end diff --git a/config/locales/models.lit.de.yml b/config/locales/models.lit.de.yml index 1e08c64..f803cad 100644 --- a/config/locales/models.lit.de.yml +++ b/config/locales/models.lit.de.yml @@ -4,16 +4,18 @@ de: ### GROUPS - group/root: - one: Hauptgruppe - other: Hauptgruppen - + group/circle: + one: Kreis + other: Kreise + group/help_circle: + one: Hilfkreis + other: Hilfskreise ### ROLES - group/root/leader: + group/circle/leader: one: Leitung description: Leitungspersonen verwalten die Applikation. - group/root/member: + group/circle/member: one: Mitglied description: Mitglieder sind alle anderen. \ No newline at end of file diff --git a/config/settings.yml b/config/settings.yml index 4aa73b5..e63e312 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -14,4 +14,4 @@ application: # not the customers. # Initially, a password reset token may be mailed from the application # to this address to set a password. -root_email: hitobito-lit@puzzle.ch +root_email: root@local-it.org \ No newline at end of file diff --git a/db/seeds/development/1_people.rb b/db/seeds/development/1_people.rb index a96f2eb..2b79c88 100644 --- a/db/seeds/development/1_people.rb +++ b/db/seeds/development/1_people.rb @@ -14,26 +14,9 @@ class LitPersonSeeder < PersonSeeder end -puzzlers = [ - 'Andreas Maierhofer', - 'Carlo Beltrame', - 'Mathis Hofer', - 'Matthias Viehweger', - 'Nils Rauch', - 'Olivier Brian', - 'Pascal Simon', - 'Pascal Zumkehr', - 'Roland Studer', - 'Tobias Hinderling', - 'Severin Raez' -] - devs = { - 'Customer Name' => 'customer@email.com' + 'Philipp Rothmann' => 'p.rothmann@local-it.org' } -puzzlers.each do |puz| - devs[puz] = "#{puz.split.last.downcase}@puzzle.ch" -end seeder = LitPersonSeeder.new @@ -41,5 +24,5 @@ seeder.seed_all_roles root = Group.root devs.each do |name, email| - seeder.seed_developer(name, email, root, Group::Root::Leader) + seeder.seed_developer(name, email, root, Group::Circle::Leader) end diff --git a/db/seeds/groups.rb b/db/seeds/groups.rb index 4a8c5d3..986b3fb 100644 --- a/db/seeds/groups.rb +++ b/db/seeds/groups.rb @@ -1,3 +1,3 @@ # encoding: utf-8 -Group::Root.seed_once(:parent_id, name: 'Hauptgruppe') +Group::Circle.seed_once(:parent_id, name: 'Koordinationskreis')