Unverified Commit 533a33f9 authored by Nicola Soranzo's avatar Nicola Soranzo
Browse files

Merge branch 'release_22.01' into release_22.05

parents 65cbbd6c 582a7b95

doc/source/releases/22.01_announce_user.rst

+3 −7
Original line number Diff line number Diff line
@@ -14,9 +14,7 @@ Do you use tools which require colour inputs, like Circos? Previously we had a r 


.. raw:: html



   <video controls autoplay loop muted width="100%" alt="Gif of the colour selector in action, a mouse clicks on the colour selector and gone is the restricted 20 colour palette, now there is a colour field and you can select any possible RGB colour.">

       <source src="../_static/22.01-colour.mp4" type="video/mp4">

   </video>

   <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/DSnFa5012RE" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen alt="Gif of the colour selector in action, a mouse clicks on the colour selector and gone is the restricted 20 colour palette, now there is a colour field and you can select any possible RGB colour."></iframe>





**Improved File Export**
@@ -25,9 +23,7 @@ If you've been exporting files from Galaxy lately, you've probably seen the amaz 


.. raw:: html



   <video controls autoplay loop muted width="100%" alt="Video of a user exporting a file using the new file export, selecting a folder, creating some subdirectories, before changing their mind and choosing another location to export their file to.">

       <source src="../_static/22.01-export.mp4" type="video/mp4">

   </video>

   <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/KBFrgWGlPus" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen alt="Video of a user exporting a file using the new file export, selecting a folder, creating some subdirectories, before changing their mind and choosing another location to export their file to."></iframe>



**Improved File Uploads**

doc/source/releases/images/22.01-colour.mp4

deleted100644 → 0
−472 KiB

File deleted.

View file

doc/source/releases/images/22.01-export.mp4

deleted100644 → 0
−597 KiB

File deleted.

View file

lib/galaxy/managers/histories.py

+4 −2
Original line number Diff line number Diff line
@@ -480,9 +480,11 @@ class HistorySerializer(sharable.SharableModelSerializer, deletable.PurgableSeri 
            "size": lambda item, key, **context: int(item.disk_size),

            "nice_size": lambda item, key, **context: item.disk_nice_size,

            "state": self.serialize_history_state,

            "url": lambda item, key, **context: self.url_for("history", id=self.app.security.encode_id(item.id)),

            "url": lambda item, key, **context: self.url_for(

                "history", id=self.app.security.encode_id(item.id), context=context

            ),

            "contents_url": lambda item, key, **context: self.url_for(

                "history_contents", history_id=self.app.security.encode_id(item.id)

                "history_contents", history_id=self.app.security.encode_id(item.id), context=context

            ),

            "empty": lambda item, key, **context: (len(item.datasets) + len(item.dataset_collections)) <= 0,

            "count": lambda item, key, **context: len(item.datasets),

lib/galaxy/webapps/galaxy/api/histories.py

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ class FastAPIHistories: 


    @router.get(

        "/api/histories/{id}",

        name="history",

        summary="Returns the history with the given ID.",

    )

    def show(