Merge branch '6099-add-subscription-plugin-2' into '1.4-dev'

Resolve "Add subscription plugin" See merge request fusiondirectory/fd-plugins!858

Merge branch '6099-add-subscription-plugin-2' into '1.4-dev'
Resolve "Add subscription plugin" See merge request fusiondirectory/fd-plugins!858
a05216c3 · Côme Chilliet · 381c59d3 · 59095798 · a05216c3
Commit a05216c3 authored 4 years ago by Côme Chilliet
Hide whitespace changes
Inline Side-by-side

Showing

with 10 additions and 11 deletions
+10 -11
--- a/subscriptions/config/subscriptions/class_subscriptionsConfig.inc
+++ b/subscriptions/config/subscriptions/class_subscriptionsConfig.inc
@@ -27,8 +27,7 @@ class subscriptionsConfig extends simplePlugin
      'plShortName'     => _('Subscriptions configuration'),
      'plDescription'   => _('FusionDirectory subscriptions plugin configuration'),
      'plObjectClass'   => ['fdSubscriptionsPluginConf'],
-      'plCategory'      => ['configuration'],
+      'plObjectType'    => ['configuration'],
-      'plObjectType'    => ['smallConfig'],
      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
    ];
@@ -67,18 +66,14 @@ class subscriptionsConfig extends simplePlugin
            [],
            TRUE
          ),
-          new StringAttribute(
-            _('Repositories host'), _('Host for the repositories, to use in auth.conf'),
-            'fdSubscriptionHost', FALSE
-          ),
          new OrderedArrayAttribute(
            new CompositeAttribute(
              _('Apt repositories'),
              'fdSubscriptionAptRepositories',
              [
                new StringAttribute(
-                  _('Repository'), _('Repository path'),
+                  _('Path'), _('Repository path'),
-                  'fdSubscriptionAptRepositories_repo', TRUE
+                  'fdSubscriptionAptRepositories_path', TRUE
                ),
                new StringAttribute(
                  _('Distribution'), _('Distribution name'),
@@ -92,7 +87,7 @@ class subscriptionsConfig extends simplePlugin
              '/^([^ ]+) ([^ ;]+);(.+)$/',
              '%s %s;%s',
              '',
-              _('Rpm repositories')
+              _('Apt repositories')
            ),
            FALSE,
            [],
@@ -104,8 +99,8 @@ class subscriptionsConfig extends simplePlugin
              'fdSubscriptionRpmRepositories',
              [
                new StringAttribute(
-                  _('Repository'), _('Repository path'),
+                  _('Path'), _('Repository path'),
-                  'fdSubscriptionRpmRepositories_repo', TRUE
+                  'fdSubscriptionRpmRepositories_path', TRUE
                ),
                new StringAttribute(
                  _('Label'), _('Label shown for this repository'),
@@ -120,6 +115,10 @@ class subscriptionsConfig extends simplePlugin
            [],
            TRUE
          ),
+          new StringAttribute(
+            _('Repositories host'), _('Host for the repositories, to use in auth.conf'),
+            'fdSubscriptionHost', FALSE
+          ),
        ],
      ],
    ];