Skip to content
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

Accept udt as extension in import document type #11108

Merged
merged 5 commits into from
Oct 27, 2021
Merged

Accept udt as extension in import document type #11108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e55c71f
Pass in invalid files
bjarnef Sep 15, 2021
6e2198b
Fix pattern and accept udt file extension
bjarnef Sep 15, 2021
dfc07a8
Remove wildcard
bjarnef Sep 15, 2021
c3e98f5
resolve conflicts
nathanwoulfe Oct 27, 2021
88cd538
fix help text - referred to 'browse' button, which does not exist
nathanwoulfe Oct 27, 2021
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
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/documenttypes/import.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ angular.module("umbraco")

vm.cancelButtonLabel = "cancel";

$scope.handleFiles = function (files, event) {
$scope.handleFiles = function (files, event, invalidFiles) {
if (files && files.length > 0) {
$scope.upload(files[0]);
}
Expand Down
7 changes: 4 additions & 3 deletions src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div ng-if="vm.state === 'upload'">
<p>
<localize key="settings_importDocumentTypeHelp">
To import a document type, find the '.udt' file on your computer by clicking the 'Browse' button and click 'Import' (you'll be asked for confirmation on the next screen)
To import a document type, find the '.udt' file on your computer by clicking the 'Import' button (you'll be asked for confirmation on the next screen)
</localize>
</p>

Expand All @@ -16,9 +16,10 @@
name="file"
ngf-select
ng-model="filesHolder"
ngf-change="handleFiles($files, $event)"
ngf-change="handleFiles($files, $event, $invalidFiles)"
ngf-multiple="true"
ngf-pattern="*.udt">
ngf-pattern="*.udt"
accept=".udt">
<localize key="general_import">Import</localize>
</button>
</form>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1408,7 +1408,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
</area>
<area alias="settings">
<key alias="defaulttemplate">Default template</key>
<key alias="importDocumentTypeHelp">To import a Document Type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen)</key>
<key alias="importDocumentTypeHelp">To import a Document Type, find the ".udt" file on your computer by clicking the "Import" button (you'll be asked for confirmation on the next screen)</key>
<key alias="newtabname">New Tab Title</key>
<key alias="nodetype">Node type</key>
<key alias="objecttype">Type</key>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,7 +1413,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
</area>
<area alias="settings">
<key alias="defaulttemplate">Default template</key>
<key alias="importDocumentTypeHelp">To import a Document Type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen)</key>
<key alias="importDocumentTypeHelp">To import a Document Type, find the ".udt" file on your computer by clicking the "Import" button (you'll be asked for confirmation on the next screen)</key>
<key alias="newtabname">New Tab Title</key>
<key alias="nodetype">Node type</key>
<key alias="objecttype">Type</key>
Expand Down