Merge pull request #9687 from archesproject/dev/7.4.x

Update 7.5 with changes in dev/7.4.x
archesproject · Jun 21, 2023 · a937c2c · a937c2c
2 parents ff635d0 + 1aa23cc
commit a937c2c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/arches/app/models/models.py b/arches/app/models/models.py
@@ -340,7 +340,7 @@ class TempFile(models.Model):
     path = models.FileField(upload_to="archestemp")
 
     def __init__(self, *args, **kwargs):
-        super(File, self).__init__(*args, **kwargs)
+        super(TempFile, self).__init__(*args, **kwargs)
         if not self.fileid:
             self.fileid = uuid.uuid4()
 

diff --git a/arches/app/templates/email/download_ready_email_notification.htm b/arches/app/templates/email/download_ready_email_notification.htm
@@ -23,8 +23,10 @@
         </div>
         <!-- /ko -->
 
+    {% if link != "" %}
     <a class="btn" href="{{email_link}}"><button
-            class='btn btn-notifs-download btn-labeled btn-sm fa fa-download'><span>{{button_text}}</span></button></a>
+            class='btn btn-notifs-download btn-labeled btn-sm fa fa-download'><span>{{button_text}}</span></button></a>    
+    {% endif %}
     {% endif %}
     <p>{{closing}}</p>
 </body>

diff --git a/arches/app/templates/views/components/widgets/rich-text.htm b/arches/app/templates/views/components/widgets/rich-text.htm
@@ -8,7 +8,7 @@
         <div class="widget-inline-tools-collapser" data-bind=" click: function() {
             showi18nOptions(!showi18nOptions());
         }">
-            <span>
+            <span style="flex: 1">
                 <label class="control-label widget-input-label" data-bind="text:label"></label>
                 <!-- ko if: node -->
                 <i data-bind="css: {'ion-asterisk widget-label-required': node.isrequired}"></i>