Unverified Commit 4d9cf367 authored by mvdbeek's avatar mvdbeek
Browse files

Consistently use isoformat

parent 4d9195ed

lib/galaxy/managers/cloudauthzs.py

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ class CloudAuthzsSerializer(base.ModelSerializer): 
            else None,

            "last_update": lambda item, key, **context: str(item.last_update),

            "last_activity": lambda item, key, **context: str(item.last_activity),

            "create_time": lambda item, key, **context: str(item.create_time),

            "create_time": lambda item, key, **context: item.create_time.isoformat(),

            "description": lambda item, key, **context: str(item.description),

        }

        self.serializers.update(serializers)

lib/galaxy/managers/library_datasets.py

+2 −2
Original line number Diff line number Diff line
@@ -243,8 +243,8 @@ class LibraryDatasetsManager(datasets.DatasetAssociationManager): 
        rval["folder_id"] = f"F{rval['folder_id']}"

        rval["full_path"] = full_path

        rval["file_size"] = util.nice_size(int(ldda.get_size()))

        rval["date_uploaded"] = ldda.create_time.strftime("%Y-%m-%d %I:%M %p")

        rval["update_time"] = ldda.update_time.strftime("%Y-%m-%d %I:%M %p")

        rval["date_uploaded"] = ldda.create_time.isoformat()

        rval["update_time"] = ldda.update_time.isoformat()

        rval["can_user_modify"] = trans.user_is_admin or trans.app.security_agent.can_modify_library_item(

            current_user_roles, ld

        )

lib/galaxy/model/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -8919,8 +8919,8 @@ class PageRevision(Base, Dictifiable, RepresentById): 


    def to_dict(self, view="element"):

        rval = super().to_dict(view=view)

        rval["create_time"] = str(self.create_time)

        rval["update_time"] = str(self.update_time)

        rval["create_time"] = self.create_time.isoformat()

        rval["update_time"] = self.update_time.isoformat()

        return rval

lib/galaxy/webapps/base/controller.py

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ class UsesLibraryMixinItems(SharableItemSecurityMixin): 
        trans.sa_session.flush()

        ldda_dict = ldda.to_dict()

        rval = trans.security.encode_dict_ids(ldda_dict)

        update_time = ldda.update_time.strftime("%Y-%m-%d %I:%M %p")

        update_time = ldda.update_time.isoformat()

        rval["update_time"] = update_time

        return rval

lib/galaxy/webapps/galaxy/api/workflows.py

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ class WorkflowsAPIController( 
            trans, workflow_id, by_stored_id=not instance

        )

        return [

            {"version": i, "update_time": str(w.update_time), "steps": len(w.steps)}

            {"version": i, "update_time": w.update_time.isoformat(), "steps": len(w.steps)}

            for i, w in enumerate(reversed(stored_workflow.workflows))

        ]