diff --git a/Dockerfile b/Dockerfile index f375713e4..546c15a60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ ARG IFXUSER_COMMIT=039a7a62cd67255bcb8992daec3b71bd433581b2 ARG IFXMAIL_CLIENT_COMMIT=8f728ff54441d2f2449fd3c31b75f0f77372b5f2 ARG FIINE_CLIENT_COMMIT=112858d4115ee6447ab9e396403fc5b48858cb70 ARG IFXEC_COMMIT=0c09c90890fb87d4db22c635a6c403c89e1a957f -ARG IFXBILLING_COMMIT=24bb3db35046ccaac42e27fe7e1799ff5697888e +ARG IFXBILLING_COMMIT=7521a286a2a5aa9a317b9586939a3d218b41a73d RUN --mount=type=ssh pip install --upgrade pip && \ pip install git+ssh://git@github.com/harvardinformatics/ifxurls.git@${IFXURLS_COMMIT} && \ diff --git a/coldfront/core/allocation/templates/allocation/allocation_detail.html b/coldfront/core/allocation/templates/allocation/allocation_detail.html index 8f677c2d9..96a3a0d52 100644 --- a/coldfront/core/allocation/templates/allocation/allocation_detail.html +++ b/coldfront/core/allocation/templates/allocation/allocation_detail.html @@ -1,3 +1,10 @@ + + + + + + + {% extends "common/base.html" %} {% load crispy_forms_tags %} {% load static %} diff --git a/coldfront/plugins/fasrc/management/commands/id_import_new_allocations.py b/coldfront/plugins/fasrc/management/commands/id_import_new_allocations.py index 7d0f292cf..dd013e388 100644 --- a/coldfront/plugins/fasrc/management/commands/id_import_new_allocations.py +++ b/coldfront/plugins/fasrc/management/commands/id_import_new_allocations.py @@ -139,5 +139,5 @@ def handle(self, *args, **options): push_quota_data(result_file) data_pull = RedashDataPipeline() allocationquerymatch_objs, user_models = data_pull.clean_collected_data() - data_pull.update_coldfront_objects(allocationquerymatch_objs, user_models) + data_pull.update_coldfront_objects(user_models) return json.dumps(command_report, indent=2) diff --git a/coldfront/plugins/sftocf/management/commands/pull_sf_push_cf.py b/coldfront/plugins/sftocf/management/commands/pull_sf_push_cf.py index be0c1a302..adb2ae265 100644 --- a/coldfront/plugins/sftocf/management/commands/pull_sf_push_cf.py +++ b/coldfront/plugins/sftocf/management/commands/pull_sf_push_cf.py @@ -38,6 +38,6 @@ def handle(self, *args, **kwargs): raise ValueError('unrecognized type argument') allocationquerymatch_objs, user_models = data_pull.clean_collected_data() - data_pull.update_coldfront_objects(allocationquerymatch_objs, user_models) + data_pull.update_coldfront_objects(user_models) logger.debug('pull_sf_push_cf complete') diff --git a/coldfront/plugins/sftocf/tasks.py b/coldfront/plugins/sftocf/tasks.py index 8982c211a..87f66b534 100644 --- a/coldfront/plugins/sftocf/tasks.py +++ b/coldfront/plugins/sftocf/tasks.py @@ -2,3 +2,6 @@ def pull_sf_push_cf(): management.call_command('pull_sf_push_cf') + +def update_zones(): + management.call_command('update_zones')