Skip to content

Commit

Permalink
Merge branch 'master' into py3-run-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@smotornyuk
smotornyuk committed Jan 16, 2020
2 parents 143d283 + 4e0227c commit f5f4a40
Show file tree
Hide file tree
Showing 15 changed files with 318 additions and 136 deletions.
3 changes: 2 additions & 1 deletion ckan/lib/uploader.py
View file
Expand Up @@ -214,7 +214,8 @@ def __init__(self, resource):
if url and config_mimetype_guess == 'file_ext':
self.mimetype = mimetypes.guess_type(url)[0]

if isinstance(upload_field_storage, ALLOWED_UPLOAD_TYPES):
if bool(upload_field_storage) and \
isinstance(upload_field_storage, ALLOWED_UPLOAD_TYPES):
self.filesize = 0 # bytes

self.filename = upload_field_storage.filename
Expand Down
57 changes: 35 additions & 22 deletions ckan/public/base/css/fuchsia.css
View file
Expand Up @@ -8150,6 +8150,11 @@ fieldset[disabled] .control-custom.disabled .checkbox.btn.focus {
.js .image-upload .btn-remove-url .icon-remove {
margin-right: 0;
}
.js .image-upload .error-inline {
margin-top: 5px;
margin-left: 2px;
font-weight: bold;
}
.add-member-form .control-label {
display: block;
}
Expand Down Expand Up @@ -8481,6 +8486,29 @@ fieldset[disabled] .control-custom.disabled .checkbox.btn.focus {
#activity-archive-notice {
clear: both;
}
/* diff styles */
table.diff {
font-family: Courier;
border: medium;
}
.diff_header {
background-color: #e0e0e0;
}
td.diff_header {
text-align: right;
}
.diff_next {
background-color: #c0c0c0;
}
.diff_add {
background-color: #aaffaa;
}
.diff_chg {
background-color: #ffff77;
}
.diff_sub {
background-color: #ffaaaa;
}
.search-form {
margin-bottom: 20px;
padding-bottom: 25px;
Expand Down Expand Up @@ -10366,6 +10394,13 @@ h4 small {
.activity .item.follow-group .icon {
background-color: #8ba669;
}
.select-time {
width: 250px;
display: inline;
}
br.line-height2 {
line-height: 2;
}
.dropdown:hover .dropdown-menu {
display: block;
}
Expand Down Expand Up @@ -10760,25 +10795,3 @@ iframe {
.reduced-padding {
padding: 3px 5px;
}
table.diff {
font-family:Courier;
border:medium;
}
.diff_header {
background-color:#e0e0e0;
}
td.diff_header {
text-align:right;
}
.diff_next {
background-color:#c0c0c0;
}
.diff_add {
background-color:#aaffaa;
}
.diff_chg {
background-color:#ffff77;
}
.diff_sub {
background-color:#ffaaaa;
}
57 changes: 35 additions & 22 deletions ckan/public/base/css/green.css
View file
Expand Up @@ -8150,6 +8150,11 @@ fieldset[disabled] .control-custom.disabled .checkbox.btn.focus {
.js .image-upload .btn-remove-url .icon-remove {
margin-right: 0;
}
.js .image-upload .error-inline {
margin-top: 5px;
margin-left: 2px;
font-weight: bold;
}
.add-member-form .control-label {
display: block;
}
Expand Down Expand Up @@ -8481,6 +8486,29 @@ fieldset[disabled] .control-custom.disabled .checkbox.btn.focus {
#activity-archive-notice {
clear: both;
}
/* diff styles */
table.diff {
font-family: Courier;
border: medium;
}
.diff_header {
background-color: #e0e0e0;
}
td.diff_header {
text-align: right;
}
.diff_next {
background-color: #c0c0c0;
}
.diff_add {
background-color: #aaffaa;
}
.diff_chg {
background-color: #ffff77;
}
.diff_sub {
background-color: #ffaaaa;
}
.search-form {
margin-bottom: 20px;
padding-bottom: 25px;
Expand Down Expand Up @@ -10366,6 +10394,13 @@ h4 small {
.activity .item.follow-group .icon {
background-color: #8ba669;
}
.select-time {
width: 250px;
display: inline;
}
br.line-height2 {
line-height: 2;
}
.dropdown:hover .dropdown-menu {
display: block;
}
Expand Down Expand Up @@ -10760,25 +10795,3 @@ iframe {
.reduced-padding {
padding: 3px 5px;
}
table.diff {
font-family:Courier;
border:medium;
}
.diff_header {
background-color:#e0e0e0;
}
td.diff_header {
text-align:right;
}
.diff_next {
background-color:#c0c0c0;
}
.diff_add {
background-color:#aaffaa;
}
.diff_chg {
background-color:#ffff77;
}
.diff_sub {
background-color:#ffaaaa;
}
50 changes: 28 additions & 22 deletions ckan/public/base/css/main.css
View file
Expand Up @@ -8150,6 +8150,11 @@ fieldset[disabled] .control-custom.disabled .checkbox.btn.focus {
.js .image-upload .btn-remove-url .icon-remove {
margin-right: 0;
}
.js .image-upload .error-inline {
margin-top: 5px;
margin-left: 2px;
font-weight: bold;
}
.add-member-form .control-label {
display: block;
}
Expand Down Expand Up @@ -8481,6 +8486,29 @@ fieldset[disabled] .control-custom.disabled .checkbox.btn.focus {
#activity-archive-notice {
clear: both;
}
/* diff styles */
table.diff {
font-family: Courier;
border: medium;
}
.diff_header {
background-color: #e0e0e0;
}
td.diff_header {
text-align: right;
}
.diff_next {
background-color: #c0c0c0;
}
.diff_add {
background-color: #aaffaa;
}
.diff_chg {
background-color: #ffff77;
}
.diff_sub {
background-color: #ffaaaa;
}
.search-form {
margin-bottom: 20px;
padding-bottom: 25px;
Expand Down Expand Up @@ -10767,25 +10795,3 @@ iframe {
.reduced-padding {
padding: 3px 5px;
}
table.diff {
font-family:Courier;
border:medium;
}
.diff_header {
background-color:#e0e0e0;
}
td.diff_header {
text-align:right;
}
.diff_next {
background-color:#c0c0c0;
}
.diff_add {
background-color:#aaffaa;
}
.diff_chg {
background-color:#ffff77;
}
.diff_sub {
background-color:#ffaaaa;
}
57 changes: 35 additions & 22 deletions ckan/public/base/css/maroon.css
View file
Expand Up @@ -8150,6 +8150,11 @@ fieldset[disabled] .control-custom.disabled .checkbox.btn.focus {
.js .image-upload .btn-remove-url .icon-remove {
margin-right: 0;
}
.js .image-upload .error-inline {
margin-top: 5px;
margin-left: 2px;
font-weight: bold;
}
.add-member-form .control-label {
display: block;
}
Expand Down Expand Up @@ -8481,6 +8486,29 @@ fieldset[disabled] .control-custom.disabled .checkbox.btn.focus {
#activity-archive-notice {
clear: both;
}
/* diff styles */
table.diff {
font-family: Courier;
border: medium;
}
.diff_header {
background-color: #e0e0e0;
}
td.diff_header {
text-align: right;
}
.diff_next {
background-color: #c0c0c0;
}
.diff_add {
background-color: #aaffaa;
}
.diff_chg {
background-color: #ffff77;
}
.diff_sub {
background-color: #ffaaaa;
}
.search-form {
margin-bottom: 20px;
padding-bottom: 25px;
Expand Down Expand Up @@ -10366,6 +10394,13 @@ h4 small {
.activity .item.follow-group .icon {
background-color: #8ba669;
}
.select-time {
width: 250px;
display: inline;
}
br.line-height2 {
line-height: 2;
}
.dropdown:hover .dropdown-menu {
display: block;
}
Expand Down Expand Up @@ -10760,25 +10795,3 @@ iframe {
.reduced-padding {
padding: 3px 5px;
}
table.diff {
font-family:Courier;
border:medium;
}
.diff_header {
background-color:#e0e0e0;
}
td.diff_header {
text-align:right;
}
.diff_next {
background-color:#c0c0c0;
}
.diff_add {
background-color:#aaffaa;
}
.diff_chg {
background-color:#ffff77;
}
.diff_sub {
background-color:#ffaaaa;
}

0 comments on commit f5f4a40

Please sign in to comment.