Upload refactor (#18)

* upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * upload refactor * cleanup
belgium-its-steering-committee · Apr 14, 2022 · 919c283 · 919c283
1 parent 0d9fea3
commit 919c283
Show file tree

Hide file tree

Showing 2,556 changed files with 515,164 additions and 4 deletions.
diff --git a/ckanext/scheming/fanstatic/scheming-upload.js b/ckanext/scheming/fanstatic/scheming-upload.js
@@ -0,0 +1,8 @@
+$(document).ready(function(){
+    setTimeout(function(){
+        $( "div[data-module-field_upload|='rtti_upload_doc']>div.form-group>label" ).text( $("div[data-module-field_upload|='rtti_upload_doc']" ).attr("data-module-upload_label") );
+        $( "div[data-module-field_upload|='srti_upload_doc']>div.form-group>label" ).text( $("div[data-module-field_upload|='srti_upload_doc']" ).attr("data-module-upload_label") );
+        $( "div[data-module-field_upload|='sstp_upload_doc']>div.form-group>label" ).text( $("div[data-module-field_upload|='sstp_upload_doc']" ).attr("data-module-upload_label") );
+        $( "div[data-module-field_upload|='image_upload']>div.form-group>label" ).text( $("div[data-module-field_upload|='image_upload']" ).attr("data-module-upload_label") );
+    },1000);
+  });
diff --git a/ckanext/scheming/plugins.py b/ckanext/scheming/plugins.py
@@ -156,6 +156,7 @@ def update_config(self, config):
         self._store_instance(self)
         self._add_template_directory(config)
         self._load_presets(config)
+        t.add_resource('fanstatic', 'scheming')
 
         self._is_fallback = asbool(config.get(self.FALLBACK_OPTION, False))
 
@@ -166,6 +167,7 @@ def update_config(self, config):
         )
         self._expanded_schemas = _expand_schemas(self._schemas)
 
+
     def is_fallback(self):
         return self._is_fallback
 

diff --git a/ckanext/scheming/templates/base.html b/ckanext/scheming/templates/base.html
@@ -0,0 +1,7 @@
+{% ckan_extends %}
+
+{% block styles %}
+  {{ super() }}
+
+  {% resource 'scheming/scheming-upload.js' %}
+{% endblock %}
diff --git a/ckanext/scheming/templates/scheming/form_snippets/doc_upload.html b/ckanext/scheming/templates/scheming/form_snippets/doc_upload.html
@@ -1,19 +1,68 @@
 {% import 'macros/form.html' as form %}
 
-{%- set is_upload = (data.url_type == 'upload') -%}
-{{ form.image_upload(
+{% macro doc_upload(data, errors, field_url='image_url', field_upload='image_upload', field_clear='clear_upload',
+                      is_url=false, is_upload=false, is_upload_enabled=false, placeholder=false,
+                      url_label='', upload_label='', field_name='image_url')  %}
+  {% set placeholder = placeholder if placeholder else false %}
+  {% set url_label = url_label or _('Image URL')  %}
+  {% set upload_label = upload_label or ''  %}
+  {% set previous_upload = data['previous_upload'] %}
+
+  {% if is_upload_enabled %}
+
+
+  <div class="image-upload"
+       data-module="image-upload"
+       data-module-is_url="{{ 'false' }}"
+       data-module-is_upload="{{ 'true' if is_upload else 'false' }}"
+       data-module-field_url="{{ field_url }}"
+       data-module-field_upload="{{ field_upload }}"
+       data-module-field_clear="{{ field_clear }}"
+       data-module-upload_label="{{ upload_label }}"
+       data-module-field_name="{{ field_name }}"
+       data-module-previous_upload="{{ 'true' if previous_upload else 'false' }}">
+  {% endif %}
+
+
+   {{ form.input(field_url, label=url_label, id='field-image-url', type='url', placeholder=placeholder, value=data.get(field_url), error=errors.get(field_url), classes=['control-full']) }}
+
+
+    {% if is_upload_enabled %}
+    {{ form.input(field_upload, label=upload_label, id='field-image-upload', type='file', placeholder='', value='', error='', classes=['control-full']) }}
+    {% if is_upload %}
+    {{ form.checkbox(field_clear, label=_('Clear Upload'), id='field-clear-upload', value='true', error='', classes=['control-full']) }}
+    {% endif %}
+    {% endif %}
+
+    {% if is_upload_enabled %}</div>{% endif %}
+
+  {% endmacro %}
+
+
+{% if 'rtti_doc_document_upload' in data and field.field_name == 'rtti_doc_document_upload' %}
+    {%- set is_upload = (data.rtti_doc_document_upload != '') -%}
+{% endif %}
+{% if 'srti_doc_document_upload' in data and field.field_name == 'srti_doc_document_upload' %}
+    {%- set is_upload = (data.srti_doc_document_upload != '') -%}
+{% endif %}
+{% if 'sstp_doc_document_upload' in data and field.field_name == 'sstp_doc_document_upload'  %}
+    {%- set is_upload = (data.sstp_doc_document_upload != '') -%}
+{% endif %}
+
+{{ doc_upload(
     data,
     errors,
     field_url=field.field_name,
     field_upload=field.upload_field,
     field_clear=field.upload_clear,
-    is_upload_enabled=h.uploads_enabled(),
+    is_upload_enabled=true,
     is_url=false,
     is_upload=is_upload,
     upload_label=h.scheming_language_text(field.upload_label),
     url_label=h.scheming_language_text(field.label),
     placeholder=field.form_placeholder
     )
 }}
-{# image_upload macro doesn't support call #}
+{# doc_upload macro doesn't support call #}
 {%- snippet 'scheming/form_snippets/help_text.html', field=field -%}
+
diff --git a/venv/.Python b/venv/.Python
@@ -0,0 +1 @@
+/System/Library/Frameworks/Python.framework/Versions/2.7/Python
diff --git a/venv/bin/activate b/venv/bin/activate
@@ -0,0 +1,78 @@
+# This file must be used with "source bin/activate" *from bash*
+# you cannot run it directly
+
+deactivate () {
+    unset -f pydoc >/dev/null 2>&1
+
+    # reset old environment variables
+    # ! [ -z ${VAR+_} ] returns true if VAR is declared at all
+    if ! [ -z "${_OLD_VIRTUAL_PATH+_}" ] ; then
+        PATH="$_OLD_VIRTUAL_PATH"
+        export PATH
+        unset _OLD_VIRTUAL_PATH
+    fi
+    if ! [ -z "${_OLD_VIRTUAL_PYTHONHOME+_}" ] ; then
+        PYTHONHOME="$_OLD_VIRTUAL_PYTHONHOME"
+        export PYTHONHOME
+        unset _OLD_VIRTUAL_PYTHONHOME
+    fi
+
+    # This should detect bash and zsh, which have a hash command that must
+    # be called to get it to forget past commands.  Without forgetting
+    # past commands the $PATH changes we made may not be respected
+    if [ -n "${BASH-}" ] || [ -n "${ZSH_VERSION-}" ] ; then
+        hash -r 2>/dev/null
+    fi
+
+    if ! [ -z "${_OLD_VIRTUAL_PS1+_}" ] ; then
+        PS1="$_OLD_VIRTUAL_PS1"
+        export PS1
+        unset _OLD_VIRTUAL_PS1
+    fi
+
+    unset VIRTUAL_ENV
+    if [ ! "${1-}" = "nondestructive" ] ; then
+    # Self destruct!
+        unset -f deactivate
+    fi
+}
+
+# unset irrelevant variables
+deactivate nondestructive
+
+VIRTUAL_ENV="/Users/bart/Projects/ckan/ckanext-scheming/venv"
+export VIRTUAL_ENV
+
+_OLD_VIRTUAL_PATH="$PATH"
+PATH="$VIRTUAL_ENV/bin:$PATH"
+export PATH
+
+# unset PYTHONHOME if set
+if ! [ -z "${PYTHONHOME+_}" ] ; then
+    _OLD_VIRTUAL_PYTHONHOME="$PYTHONHOME"
+    unset PYTHONHOME
+fi
+
+if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT-}" ] ; then
+    _OLD_VIRTUAL_PS1="${PS1-}"
+    if [ "x" != x ] ; then
+        PS1="${PS1-}"
+    else
+        PS1="(`basename \"$VIRTUAL_ENV\"`) ${PS1-}"
+    fi
+    export PS1
+fi
+
+# Make sure to unalias pydoc if it's already there
+alias pydoc 2>/dev/null >/dev/null && unalias pydoc || true
+
+pydoc () {
+    python -m pydoc "$@"
+}
+
+# This should detect bash and zsh, which have a hash command that must
+# be called to get it to forget past commands.  Without forgetting
+# past commands the $PATH changes we made may not be respected
+if [ -n "${BASH-}" ] || [ -n "${ZSH_VERSION-}" ] ; then
+    hash -r 2>/dev/null
+fi
diff --git a/venv/bin/activate.csh b/venv/bin/activate.csh
@@ -0,0 +1,42 @@
+# This file must be used with "source bin/activate.csh" *from csh*.
+# You cannot run it directly.
+# Created by Davide Di Blasi <[email protected]>.
+
+set newline='\
+'
+
+alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH:q" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT:q" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate && unalias pydoc'
+
+# Unset irrelevant variables.
+deactivate nondestructive
+
+setenv VIRTUAL_ENV "/Users/bart/Projects/ckan/ckanext-scheming/venv"
+
+set _OLD_VIRTUAL_PATH="$PATH:q"
+setenv PATH "$VIRTUAL_ENV:q/bin:$PATH:q"
+
+
+
+if ("" != "") then
+    set env_name = ""
+else
+    set env_name = "$VIRTUAL_ENV:t:q"
+endif
+
+# Could be in a non-interactive environment,
+# in which case, $prompt is undefined and we wouldn't
+# care about the prompt anyway.
+if ( $?prompt ) then
+    set _OLD_VIRTUAL_PROMPT="$prompt:q"
+if ( "$prompt:q" =~ *"$newline:q"* ) then
+    :
+else
+    set prompt = "[$env_name:q] $prompt:q"
+endif
+endif
+
+unset env_name
+
+alias pydoc python -m pydoc
+
+rehash
diff --git a/venv/bin/activate.fish b/venv/bin/activate.fish
@@ -0,0 +1,101 @@
+# This file must be used using `source bin/activate.fish` *within a running fish ( http://fishshell.com ) session*.
+# Do not run it directly.
+
+function _bashify_path -d "Converts a fish path to something bash can recognize"
+    set fishy_path $argv
+    set bashy_path $fishy_path[1]
+    for path_part in $fishy_path[2..-1]
+        set bashy_path "$bashy_path:$path_part"
+    end
+    echo $bashy_path
+end
+
+function _fishify_path -d "Converts a bash path to something fish can recognize"
+    echo $argv | tr ':' '\n'
+end
+
+function deactivate -d 'Exit virtualenv mode and return to the normal environment.'
+    # reset old environment variables
+    if test -n "$_OLD_VIRTUAL_PATH"
+        # https://github.com/fish-shell/fish-shell/issues/436 altered PATH handling
+        if test (echo $FISH_VERSION | tr "." "\n")[1] -lt 3
+            set -gx PATH (_fishify_path $_OLD_VIRTUAL_PATH)
+        else
+            set -gx PATH $_OLD_VIRTUAL_PATH
+        end
+        set -e _OLD_VIRTUAL_PATH
+    end
+
+    if test -n "$_OLD_VIRTUAL_PYTHONHOME"
+        set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME
+        set -e _OLD_VIRTUAL_PYTHONHOME
+    end
+
+    if test -n "$_OLD_FISH_PROMPT_OVERRIDE"
+        # Set an empty local `$fish_function_path` to allow the removal of `fish_prompt` using `functions -e`.
+        set -l fish_function_path
+
+        # Erase virtualenv's `fish_prompt` and restore the original.
+        functions -e fish_prompt
+        functions -c _old_fish_prompt fish_prompt
+        functions -e _old_fish_prompt
+        set -e _OLD_FISH_PROMPT_OVERRIDE
+    end
+
+    set -e VIRTUAL_ENV
+
+    if test "$argv[1]" != 'nondestructive'
+        # Self-destruct!
+        functions -e pydoc
+        functions -e deactivate
+        functions -e _bashify_path
+        functions -e _fishify_path
+    end
+end
+
+# Unset irrelevant variables.
+deactivate nondestructive
+
+set -gx VIRTUAL_ENV "/Users/bart/Projects/ckan/ckanext-scheming/venv"
+
+# https://github.com/fish-shell/fish-shell/issues/436 altered PATH handling
+if test (echo $FISH_VERSION | tr "." "\n")[1] -lt 3
+   set -gx _OLD_VIRTUAL_PATH (_bashify_path $PATH)
+else
+    set -gx _OLD_VIRTUAL_PATH $PATH
+end
+set -gx PATH "$VIRTUAL_ENV/bin" $PATH
+
+# Unset `$PYTHONHOME` if set.
+if set -q PYTHONHOME
+    set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME
+    set -e PYTHONHOME
+end
+
+function pydoc
+    python -m pydoc $argv
+end
+
+if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
+    # Copy the current `fish_prompt` function as `_old_fish_prompt`.
+    functions -c fish_prompt _old_fish_prompt
+
+    function fish_prompt
+        # Save the current $status, for fish_prompts that display it.
+        set -l old_status $status
+
+        # Prompt override provided?
+        # If not, just prepend the environment name.
+        if test -n ""
+            printf '%s%s' "" (set_color normal)
+        else
+            printf '%s(%s) ' (set_color normal) (basename "$VIRTUAL_ENV")
+        end
+
+        # Restore the original $status
+        echo "exit $old_status" | source
+        _old_fish_prompt
+    end
+
+    set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV"
+end
diff --git a/venv/bin/activate.ps1 b/venv/bin/activate.ps1
@@ -0,0 +1,60 @@
+# This file must be dot sourced from PoSh; you cannot run it directly. Do this: . ./activate.ps1
+
+$script:THIS_PATH = $myinvocation.mycommand.path
+$script:BASE_DIR = split-path (resolve-path "$THIS_PATH/..") -Parent
+
+function global:deactivate([switch] $NonDestructive)
+{
+    if (test-path variable:_OLD_VIRTUAL_PATH)
+    {
+        $env:PATH = $variable:_OLD_VIRTUAL_PATH
+        remove-variable "_OLD_VIRTUAL_PATH" -scope global
+    }
+
+    if (test-path function:_old_virtual_prompt)
+    {
+        $function:prompt = $function:_old_virtual_prompt
+        remove-item function:\_old_virtual_prompt
+    }
+
+    if ($env:VIRTUAL_ENV)
+    {
+        $old_env = split-path $env:VIRTUAL_ENV -leaf
+        remove-item env:VIRTUAL_ENV -erroraction silentlycontinue
+    }
+
+    if (!$NonDestructive)
+    {
+        # Self destruct!
+        remove-item function:deactivate
+        remove-item function:pydoc
+    }
+}
+
+function global:pydoc
+{
+    python -m pydoc $args
+}
+
+# unset irrelevant variables
+deactivate -nondestructive
+
+$VIRTUAL_ENV = $BASE_DIR
+$env:VIRTUAL_ENV = $VIRTUAL_ENV
+
+$global:_OLD_VIRTUAL_PATH = $env:PATH
+$env:PATH = "$env:VIRTUAL_ENV/bin:" + $env:PATH
+if (!$env:VIRTUAL_ENV_DISABLE_PROMPT)
+{
+    function global:_old_virtual_prompt
+    {
+        ""
+    }
+    $function:_old_virtual_prompt = $function:prompt
+    function global:prompt
+    {
+        # Add a prefix to the current prompt, but don't discard it.
+        write-host "($( split-path $env:VIRTUAL_ENV -leaf )) " -nonewline
+        & $function:_old_virtual_prompt
+    }
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/System/Library/Frameworks/Python.framework/Versions/2.7/Python