Merge branch 'release/1.20.2' into fix-masonry-space

Author: robkooper

.github/workflows/swagger.yml

@@ -23,6 +23,6 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: openapi-lint 
-        uses: mhiew/redoc-lint-github-action@v2
+        uses: mbowman100/swagger-validator-action@master
         with:
-          args: 'public/swagger.yml --skip-rule operation-operationId'
+          files: public/swagger.yml

CHANGELOG.md

@@ -5,11 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## Unreleased
+## 1.20.2 - 2022-04-30
 
 ### Fixed
+- swagger lint action
+- When downloading a file with a `'` in the name it would save the file as blob
 - Fix for a rare race condition with masonry where tiles could end up overlapping in space page.
 
+### Changed
+- Changed `Enabled By SuperAdmin` to read `Enabled by Server Admin` [#344](https://github.com/clowder-framework/clowder/issues/344)
+
 ## 1.20.1 - 2022-04-04
 
 ### Fixed

app/util/FileUtils.scala

@@ -856,37 +856,20 @@ object FileUtils {
   //Download CONTENT-DISPOSITION encoding
   //
   def encodeAttachment(filename: String, userAgent: String) : String = {
-    val filenameStar = if (userAgent.indexOf("MSIE") > -1) {
-                              URLEncoder.encode(filename, "UTF-8")
-                            } else if (userAgent.indexOf("Edge") > -1){
-                              MimeUtility.encodeText(filename
-                                  .replaceAll(",","%2C")
-                                  .replaceAll("\"","%22")
-                                  .replaceAll("/","%2F")
-                                  .replaceAll("=","%3D")
-                                  .replaceAll("&","%26")
-                                  .replaceAll(":","%3A")
-                                  .replaceAll(";","%3B")
-                                  .replaceAll("\\?","%3F")
-                                  .replaceAll("\\*","%2A")
+    val filenameStar = MimeUtility.encodeText(filename
+                                    .replaceAll("%","%25")
+                                    .replaceAll(" ","%20")
+                                    .replaceAll("\"","%22")
+                                    .replaceAll("'","%27")
+                                    .replaceAll(",","%2C")
+                                    .replaceAll("/","%2F")
+                                    .replaceAll("=","%3D")
+                                    .replaceAll(":","%3A")
+                                    .replaceAll(";","%3B")
+                                    .replaceAll("\\*","%2A")
                                   ,"utf-8","Q")
-                            } else {
-                              MimeUtility.encodeText(filename
-                                  .replaceAll("%","%25")
-                                  .replaceAll(" ","%20")
-                                  .replaceAll("\"","%22")
-                                  .replaceAll(",","%2C")
-                                  .replaceAll("/","%2F")
-                                  .replaceAll("=","%3D")
-                                  .replaceAll(":","%3A")
-                                  .replaceAll(";","%3B")
-                                  .replaceAll("\\*","%2A")
-                                  ,"utf-8","Q")
-                            }
-    Logger.debug(userAgent + ": " + filenameStar)
 
     //Return the complete attachment header info
     "attachment; filename*=UTF-8''" + filenameStar
   }
-
 }

app/views/spaces/updateExtractors.scala.html

@@ -35,8 +35,8 @@ <h1>Space Extractors</h1>
 					<th>Name</th>
 					<th>Description</th>
 					<th>Process Triggers</th>
-					<th class="text-center" title="Extractors marked for execution in all spaces">Enabled By SuperAdmin</th>
-					<th class="text-center" title="Follow selection in 'Enabled By SuperAdmin' column">Use Default</th>
+					<th class="text-center" title="Extractors marked for execution in all spaces">Enabled by Server Admin</th>
+					<th class="text-center" title="Follow selection in 'Enabled by Server Admin' column">Use Default</th>
 					<th class="text-center" title="Always trigger execution in this space">Enable in Space</th>
 					<th class="text-center" title="Never trigger execution in this space">Disable in Space</th>
 				</tr>

doc/src/sphinx/conf.py

@@ -22,7 +22,7 @@
 author = 'Luigi Marini'
 
 # The full version, including alpha/beta/rc tags
-release = '1.20.1'
+release = '1.20.2'
 
 
 # -- General configuration ---------------------------------------------------

project/Build.scala

@@ -13,7 +13,7 @@ import NativePackagerKeys._
 object ApplicationBuild extends Build {
 
   val appName = "clowder"
-  val version = "1.20.1"
+  val version = "1.20.2"
   val jvm = "1.7"
 
   def appVersion: String = {

public/swagger.yml

@@ -9,7 +9,7 @@ info:
     Clowder is a customizable and scalable data management system to support any
     data format and multiple research domains. It is under active development
     and deployed for a variety of research projects.
-  version: 1.20.1
+  version: 1.20.2
   termsOfService: https://clowder.ncsa.illinois.edu/clowder/tos
   contact:
     name: Clowder