Browse Source

Improved ldap settings.

Martin Edenhofer 8 years ago
parent
commit
78b73eef43
2 changed files with 36 additions and 9 deletions
  1. 24 9
      db/migrate/20170419000001_ldap_support.rb
  2. 12 0
      db/seeds.rb

+ 24 - 9
db/migrate/20170321000001_ldap_support.rb → db/migrate/20170419000001_ldap_support.rb

@@ -4,18 +4,20 @@ class LdapSupport < ActiveRecord::Migration
     # return if it's a new setup
     return if !Setting.find_by(name: 'system_init_done')
 
-    create_table :import_jobs do |t|
-      t.string :name, limit: 250, null: false
+    if !ActiveRecord::Base.connection.table_exists? 'import_jobs'
+      create_table :import_jobs do |t|
+        t.string :name, limit: 250, null: false
 
-      t.boolean :dry_run, default: false
+        t.boolean :dry_run, default: false
 
-      t.text :payload, limit: 80_000
-      t.text :result, limit: 80_000
+        t.text :payload, limit: 80_000
+        t.text :result, limit: 80_000
 
-      t.datetime :started_at
-      t.datetime :finished_at
+        t.datetime :started_at
+        t.datetime :finished_at
 
-      t.timestamps null: false
+        t.timestamps null: false
+      end
     end
 
     Setting.create_or_update(
@@ -78,7 +80,7 @@ class LdapSupport < ActiveRecord::Migration
 
     Scheduler.create_or_update(
       name:          'Import Jobs',
-      method:        'ImportJob.start',
+      method:        'ImportJob.start_registered',
       period:        1.hour,
       prio:          1,
       active:        true,
@@ -86,6 +88,19 @@ class LdapSupport < ActiveRecord::Migration
       created_by_id: 1
     )
 
+    Setting.create_if_not_exists(
+      title:       'Import Backends',
+      name:        'import_backends',
+      area:        'Import',
+      description: 'A list of active import backends that get scheduled automatically.',
+      options:     {},
+      state:       ['Import::Ldap'],
+      preferences: {
+        permission: ['admin'],
+      },
+      frontend: false
+    )
+
   end
 
 end

+ 12 - 0
db/seeds.rb

@@ -2072,6 +2072,18 @@ Setting.create_if_not_exists(
   state: '',
   frontend: false
 )
+Setting.create_if_not_exists(
+  title:       'Import Backends',
+  name:        'import_backends',
+  area:        'Import',
+  description: 'A list of active import backends that get scheduled automatically.',
+  options:     {},
+  state:       ['Import::Ldap'],
+  preferences: {
+    permission: ['admin'],
+  },
+  frontend: false
+)
 
 Setting.create_if_not_exists(
   title: 'Time Accounting',