Unverified Commit 8aefad4b authored by John Davis's avatar John Davis Committed by GitHub
Browse files

Merge pull request #19045 from bernt-matthias/quota/default-noop 

[24.1] quota: do not complain on no-change of default
parents 3a195be3 7876ebed

lib/galaxy/managers/quotas.py

+10 −12
Original line number Diff line number Diff line
@@ -184,21 +184,19 @@ class QuotaManager: 
            if params.default != "no":

                self.quota_agent.set_default_quota(params.default, quota)

                message = f"Quota '{quota.name}' is now the default for {params.default} users."

            else:

                if quota.default:

            elif quota.default:

                message = f"Quota '{quota.name}' is no longer the default for {quota.default[0].type} users."

                for dqa in quota.default:

                    self.sa_session.delete(dqa)

                with transaction(self.sa_session):

                    self.sa_session.commit()

            else:

                    message = f"Quota '{quota.name}' is not a default."

                message = ""

            return message



    def unset_quota_default(self, quota, params=None) -> str:

        if not quota.default:

            raise ActionInputError(f"Quota '{quota.name}' is not a default.")

        else:

        message = ""

        if quota.default:

            message = f"Quota '{quota.name}' is no longer the default for {quota.default[0].type} users."

            for dqa in quota.default:

                self.sa_session.delete(dqa)