Merge pull request #760 from kkoralsky/custom_cli_actions_fix

max-wittig · web-flow · commit e8823e91b04f · 2019-05-10T17:23:52.000+02:00
Custom cli actions fix
diff --git a/gitlab/v4/cli.py b/gitlab/v4/cli.py
@@ -80,10 +80,10 @@ def do_custom(self):
             if gitlab.mixins.GetWithoutIdMixin not in inspect.getmro(self.cls):
                 data[self.cls._id_attr] = self.args.pop(self.cls._id_attr)
             o = self.cls(self.mgr, data)
-            method_name = self.action.replace('-', '_')
-            return getattr(o, method_name)(**self.args)
         else:
-            return getattr(self.mgr, self.action)(**self.args)
+            o = self.mgr
+        method_name = self.action.replace('-', '_')
+        return getattr(o, method_name)(**self.args)
 
     def do_project_export_download(self):
         try:
@@ -217,14 +217,14 @@ def _populate_sub_parser_by_class(cls, sub_parser):
                  for x in mgr_cls._from_parent_attrs]
                 sub_parser_action.add_argument("--sudo", required=False)
 
+            required, optional, needs_id = cli.custom_actions[name][action_name]
             # We need to get the object somehow
-            if gitlab.mixins.GetWithoutIdMixin not in inspect.getmro(cls):
+            if needs_id and gitlab.mixins.GetWithoutIdMixin not in inspect.getmro(cls):
                 if cls._id_attr is not None:
                     id_attr = cls._id_attr.replace('_', '-')
                     sub_parser_action.add_argument("--%s" % id_attr,
                                                    required=True)
 
-            required, optional, dummy = cli.custom_actions[name][action_name]
             [sub_parser_action.add_argument("--%s" % x.replace('_', '-'),
                                             required=True)
              for x in required if x != cls._id_attr]
