Skip to content

URL_FILEBROWSER_MEDIA can't use other storages #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rapto wants to merge 2 commits into
base: master
Choose a base branch
from
Open

URL_FILEBROWSER_MEDIA can't use other storages #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8456d3
URL_FILEBROWSER_MEDIA can't use other storages
rapto Mar 15, 2023
9752037
new tag for filetype
rapto Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions filebrowser_safe/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from django.db.models.fields.files import FileDescriptor
from django.forms.widgets import Input
from django.template.loader import render_to_string
from django.templatetags.static import static
from django.utils.encoding import smart_str
from django.utils.safestring import mark_safe
from django.utils.translation import gettext_lazy as _
Expand All @@ -20,7 +21,7 @@ class FileBrowseWidget(Input):
input_type = "text"

class Media:
js = (os.path.join(fb_settings.URL_FILEBROWSER_MEDIA, "js/AddFileBrowser.js"),)
js = (static("filebrowser/js/AddFileBrowser.js"),)

def __init__(self, attrs=None):
self.directory = attrs.get("directory", "")
Expand All @@ -44,7 +45,7 @@ def render(self, name, value, attrs=None, renderer=None):
default_storage.makedirs(fullpath)
final_attrs = dict(type=self.input_type, name=name, **attrs)
final_attrs["search_icon"] = (
fb_settings.URL_FILEBROWSER_MEDIA + "img/filebrowser_icon_show.gif"
static("filebrowser/img/filebrowser_icon_show.gif")
)
final_attrs["directory"] = directory
final_attrs["extensions"] = self.extensions
Expand Down
1 change: 0 additions & 1 deletion filebrowser_safe/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ def get_settings_var():
settings_var["MEDIA_URL"] = fb_settings.MEDIA_URL
settings_var["DIRECTORY"] = get_directory()
# FileBrowser
settings_var["URL_FILEBROWSER_MEDIA"] = fb_settings.URL_FILEBROWSER_MEDIA
settings_var["PATH_FILEBROWSER_MEDIA"] = fb_settings.PATH_FILEBROWSER_MEDIA
# TinyMCE
settings_var["URL_TINYMCE"] = fb_settings.URL_TINYMCE
Expand Down
6 changes: 0 additions & 6 deletions filebrowser_safe/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
# DO NOT USE A SLASH AT THE BEGINNING, DO NOT FORGET THE TRAILING SLASH AT THE END.
DIRECTORY = getattr(settings, "FILEBROWSER_DIRECTORY", "uploads/")

# The URL/PATH to your filebrowser media-files.
URL_FILEBROWSER_MEDIA = getattr(
settings,
"FILEBROWSER_URL_FILEBROWSER_MEDIA",
"%sfilebrowser/" % settings.STATIC_URL,
)
PATH_FILEBROWSER_MEDIA = getattr(
settings,
"FILEBROWSER_PATH_FILEBROWSER_MEDIA",
Expand Down
11 changes: 5 additions & 6 deletions filebrowser_safe/templates/filebrowser/include/filelisting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{% if selectable %}
<a href="javascript://" onclick="FileSubmit('{{ file.path }}', '{{ file.url }}', '{{ settings_var.MEDIA_URL }}{% if file.filetype == 'Image' %}{% thumbnail file.path 60 60 %}{% else %}{{ file.path }}{% endif %}', '{{ file.filetype }}');" class="fb_selectlink" title="{% trans 'Select' %}"></a>
{% else %}
<img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_icon_select_disabled.gif" width="23" height="17" />
<img src="{% static 'filebrowser/img/filebrowser_icon_select_disabled.gif' %}" width="23" height="17" />
{% endif %}
</td>
{% endif %}
Expand All @@ -31,7 +31,7 @@
{% if selectable %}
<a href="javascript:FileBrowserDialogue.fileSubmit('{{ file.url|escapejs }}');" class="fb_selectlink" title="{% trans 'Select File' %}"></a>
{% else %}
<img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_icon_select_disabled.gif" width="23" height="17" />
<img src="{% static 'filebrowser/img/filebrowser_icon_select_disabled.gif' %}" width="23" height="17" />
{% endif %}
</td>
{% endif %}
Expand All @@ -45,7 +45,7 @@
{% if selectable %}
<a href="#" onclick="OpenFile(ProtectPath('{{ file.url|escapejs }}'));return false;" class="fb_selectlink" title="{% trans 'Select File' %}"></a>
{% else %}
<img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_icon_select_disabled.gif" width="23" height="17" />
<img src="{% static 'filebrowser/img/filebrowser_icon_select_disabled.gif' %}" width="23" height="17" />
{% endif %}
</td>
{% endif %}
Expand All @@ -59,15 +59,14 @@
{% if selectable %}
<a href="#" rel="{{ file.url|escape }}" class="fb_selectlink" title="{% trans 'Select File' %}"></a>
{% else %}
<img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_icon_select_disabled.gif" width="23" height="17" />
<img src="{% static 'filebrowser/img/filebrowser_icon_select_disabled.gif' %}" width="23" height="17" />
{% endif %}
</td>
{% endif %}
{% endif %}

<!-- FILEICON -->
<td class="fb_icon"><img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_type_{{ file.filetype|lower }}.gif" /></td>

<td class="fb_icon"><img src="{% get_filetype_icon file.filetype %}" /></td>
<!-- THUMBNAIL -->
{% if results_var.images_total %}
<td class="fb_icon">
Expand Down
12 changes: 6 additions & 6 deletions filebrowser_safe/templates/filebrowser/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,29 @@
{% block stylesheets %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% static "grappelli/css/changelist.css" %}" />
<link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
<link rel="stylesheet" type="text/css" href="{% static 'filebrowser/css/filebrowser.css' %}" />
{% endblock %}

<!-- JAVASCRIPTS -->
{% block extrahead %}
{{ block.super }}

{% if query.pop == '1' %} <!-- FileBrowseField -->
<script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_FileBrowseField.js"></script>
<script language="javascript" type="text/javascript" src="{% static 'filebrowser/js/FB_FileBrowseField.js' %}"></script>
{% endif %}

{% if query.pop == '2' %} <!-- TinyMCE < 4 -->
<script language="javascript" type="text/javascript" src="{{ settings_var.URL_TINYMCE }}tiny_mce_popup.js"></script>
<script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_TinyMCE.js"></script>
<script language="javascript" type="text/javascript" src="{% static 'filebrowser/js/FB_TinyMCE.js' %}"></script>
{% if query.mce_rdomain %}<script language="javascript">document.domain = "{{ query.mce_rdomain }}"</script>{% endif %}
{% endif %}

{% if query.pop == '3' %} <!-- CKeditor (former "FCKeditor") -->
<script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_CKEditor.js"></script>
<script language="javascript" type="text/javascript" src="{% static 'filebrowser/js/FB_CKEditor.js' %}"></script>
{% endif %}

{% if query.pop == '5' %} <!-- TinyMCE 4 -->
<script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_TinyMCE4.js"></script>
<script language="javascript" type="text/javascript" src="{% static 'filebrowser/js/FB_TinyMCE4.js' %}"></script>
{% endif %}

<script type="text/javascript" src="{% static "grappelli/js/admin/Changelist.js" %}"></script>
Expand All @@ -43,7 +43,7 @@

{% block rtl_styles %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/rtl.css" />
<link rel="stylesheet" type="text/css" href="{% static 'filebrowser/css/rtl.css' %}" />
{% endblock %}

<!-- COLTYPE/BODYCLASS -->
Expand Down
4 changes: 2 additions & 2 deletions filebrowser_safe/templates/filebrowser/makedir.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
{% block stylesheets %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% static "grappelli/css/forms.css" %}" />
<link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
<link rel="stylesheet" type="text/css" href="{% static 'filebrowser/css/filebrowser.css' %}" />
{% endblock %}

{% block rtl_styles %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/rtl.css" />
<link rel="stylesheet" type="text/css" href="{% static 'filebrowser/css/rtl.css' %}" />
{% endblock %}

<!-- COLTYPE/BODYCLASS -->
Expand Down
4 changes: 2 additions & 2 deletions filebrowser_safe/templates/filebrowser/rename.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
{% block stylesheets %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% static "grappelli/css/forms.css" %}" />
<link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
<link rel="stylesheet" type="text/css" href="{% static 'filebrowser/css/filebrowser.css' %}" />
{% endblock %}

{% block rtl_styles %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/rtl.css" />
<link rel="stylesheet" type="text/css" href="{% static 'filebrowser/css/rtl.css' %}" />
{% endblock %}

<!-- COLTYPE/BODYCLASS -->
Expand Down
6 changes: 3 additions & 3 deletions filebrowser_safe/templates/filebrowser/upload.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
{% block stylesheets %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% static 'grappelli/css/forms.css' %}" />
<link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
<link rel="stylesheet" type="text/css" href="{% static 'filebrowser/css/filebrowser.css' %}" />
{% endblock %}

{% block rtl_styles %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/rtl.css" />
<link rel="stylesheet" type="text/css" href="{% static 'filebrowser/css/rtl.css' %}" />
{% endblock %}

<!-- JAVASCRIPTS -->
{% block extrahead %}
{{ block.super }}
<script type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/upload.js"></script>
<script type="text/javascript" src="{% static 'filebrowser/js/upload.js' %}"></script>
{% endblock extrahead %}

<!-- COLTYPE/BODYCLASS -->
Expand Down
5 changes: 5 additions & 0 deletions filebrowser_safe/templatetags/fb_tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import warnings

from django import template
from django.templatetags.static import static

from urllib.parse import quote

Expand Down Expand Up @@ -184,3 +185,7 @@ def allowed_extensions_list(separator=","):


register.simple_tag(allowed_extensions_list)

@register.simple_tag
def get_filetype_icon(filetype):
return static(f'filebrowser/img/filebrowser_type_{filetype.lower()}.gif')