Merge pull request 'master' (#292) from master into Docker
Reviewed-on: SGD-Nord/konova#292
This commit is contained in:
		
						commit
						cb38f2a157
					
				@ -130,7 +130,7 @@
 | 
			
		||||
                            {% else %}
 | 
			
		||||
                            <span title="{% trans 'The data must be shared with you, if you want to see which other users have shared access as well.' %}">
 | 
			
		||||
                                {% fa5_icon 'eye-slash' %}
 | 
			
		||||
                                {{obj.users.count}} {% trans 'other users' %}
 | 
			
		||||
                                {{obj.intervention.users.count}} {% trans 'other users' %}
 | 
			
		||||
                            </span>
 | 
			
		||||
                            {% endif %}
 | 
			
		||||
                        </td>
 | 
			
		||||
 | 
			
		||||
@ -152,7 +152,7 @@ class EgonGmlBuilder:
 | 
			
		||||
                    "oneo:aufnahmezeitpunkt": doc.date_of_creation.strftime(DEFAULT_DATE_FORMAT),
 | 
			
		||||
                    "oneo:bemerkung": doc.comment,
 | 
			
		||||
                    "oneo:fotoverweis": base64.b64encode(doc.file.read()).decode("utf-8"),
 | 
			
		||||
                    "oneo:dateiname": doc.title,
 | 
			
		||||
                    "oneo:dateiname": doc.file.url.split("/")[-1],
 | 
			
		||||
                    "oneo:hauptfoto": False,
 | 
			
		||||
                }
 | 
			
		||||
            } for doc in regular_docs
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user