Skip to content

Commit 63448fb

Browse files
authored
Merge pull request #11159 from umbraco/v9/bugfix/AB13851-correct-file-name-references
V9: Fix incorrect static filenames references
2 parents 9b357ab + f52de65 commit 63448fb

28 files changed

+472
-484
lines changed

src/Umbraco.Core/ContentApps/ContentTypeDesignContentAppFactory.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Collections.Generic;
1+
using System.Collections.Generic;
22
using Umbraco.Cms.Core.Models;
33
using Umbraco.Cms.Core.Models.ContentEditing;
44
using Umbraco.Cms.Core.Models.Membership;
@@ -21,7 +21,7 @@ public ContentApp GetContentAppFor(object source, IEnumerable<IReadOnlyUserGroup
2121
Alias = "design",
2222
Name = "Design",
2323
Icon = "icon-document-dashed-line",
24-
View = "views/documenttypes/views/design/design.html",
24+
View = "views/documentTypes/views/design/design.html",
2525
Weight = Weight
2626
});
2727
default:

src/Umbraco.Core/ContentApps/ContentTypeListViewContentAppFactory.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Collections.Generic;
1+
using System.Collections.Generic;
22
using Umbraco.Cms.Core.Models;
33
using Umbraco.Cms.Core.Models.ContentEditing;
44
using Umbraco.Cms.Core.Models.Membership;
@@ -21,7 +21,7 @@ public ContentApp GetContentAppFor(object source, IEnumerable<IReadOnlyUserGroup
2121
Alias = "listView",
2222
Name = "List view",
2323
Icon = "icon-list",
24-
View = "views/documenttypes/views/listview/listview.html",
24+
View = "views/documentTypes/views/listview/listview.html",
2525
Weight = Weight
2626
});
2727
default:

src/Umbraco.Core/ContentApps/ContentTypePermissionsContentAppFactory.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Collections.Generic;
1+
using System.Collections.Generic;
22
using Umbraco.Cms.Core.Models;
33
using Umbraco.Cms.Core.Models.ContentEditing;
44
using Umbraco.Cms.Core.Models.Membership;
@@ -21,7 +21,7 @@ public ContentApp GetContentAppFor(object source, IEnumerable<IReadOnlyUserGroup
2121
Alias = "permissions",
2222
Name = "Permissions",
2323
Icon = "icon-keychain",
24-
View = "views/documenttypes/views/permissions/permissions.html",
24+
View = "views/documentTypes/views/permissions/permissions.html",
2525
Weight = Weight
2626
});
2727
default:

src/Umbraco.Core/ContentApps/ContentTypeTemplatesContentAppFactory.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Collections.Generic;
1+
using System.Collections.Generic;
22
using Umbraco.Cms.Core.Models;
33
using Umbraco.Cms.Core.Models.ContentEditing;
44
using Umbraco.Cms.Core.Models.Membership;
@@ -21,7 +21,7 @@ public ContentApp GetContentAppFor(object source, IEnumerable<IReadOnlyUserGroup
2121
Alias = "templates",
2222
Name = "Templates",
2323
Icon = "icon-layout",
24-
View = "views/documenttypes/views/templates/templates.html",
24+
View = "views/documentTypes/views/templates/templates.html",
2525
Weight = Weight
2626
});
2727
default:

src/Umbraco.Core/PropertyEditors/ListViewConfiguration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Runtime.Serialization;
1+
using System.Runtime.Serialization;
22

33
namespace Umbraco.Cms.Core.PropertyEditors
44
{
@@ -45,7 +45,7 @@ public ListViewConfiguration()
4545
Description = "The default sort order for the list")]
4646
public string OrderBy { get; set; }
4747

48-
[ConfigurationField("orderDirection", "Order Direction", "views/propertyeditors/listview/orderdirection.prevalues.html")]
48+
[ConfigurationField("orderDirection", "Order Direction", "views/propertyeditors/listview/orderDirection.prevalues.html")]
4949
public string OrderDirection { get; set; }
5050

5151
[ConfigurationField("includeProperties", "Columns Displayed", "views/propertyeditors/listview/includeproperties.prevalues.html",
@@ -55,7 +55,7 @@ public ListViewConfiguration()
5555
[ConfigurationField("layouts", "Layouts", "views/propertyeditors/listview/layouts.prevalues.html")]
5656
public Layout[] Layouts { get; set; }
5757

58-
[ConfigurationField("bulkActionPermissions", "Bulk Action Permissions", "views/propertyeditors/listview/bulkactionpermissions.prevalues.html",
58+
[ConfigurationField("bulkActionPermissions", "Bulk Action Permissions", "views/propertyeditors/listview/bulkActionPermissions.prevalues.html",
5959
Description = "The bulk actions that are allowed from the list view")]
6060
public BulkActionPermissionSettings BulkActionPermissions { get; set; } = new BulkActionPermissionSettings(); // TODO: managing defaults?
6161

src/Umbraco.Web.UI.Client/gulp/tasks/views.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
var config = require('../config');
44
var gulp = require('gulp');
5-
var rename = require('gulp-rename');
65

76
var _ = require('lodash');
87
var MergeStream = require('merge-stream');
@@ -13,12 +12,7 @@ function views() {
1312

1413
_.forEach(config.sources.views, function (group) {
1514

16-
var task = gulp.src(group.files)
17-
.pipe(rename(function(path) {
18-
path.dirname = path.dirname.toLowerCase();
19-
path.basename = path.basename.toLowerCase();
20-
path.extname = path.extname.toLowerCase();
21-
}));
15+
var task = gulp.src(group.files);
2216

2317
_.forEach(config.roots, function(root){
2418
var destPath = root + config.targets.views + group.folder;

src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const config = require('../config');
44
const {watch, series, parallel, dest, src} = require('gulp');
55

66
var _ = require('lodash');
7-
var rename = require('gulp-rename');
87
var MergeStream = require('merge-stream');
98

109
var processJs = require('../util/processJs');
@@ -37,12 +36,7 @@ function watchTask(cb) {
3736
viewWatcher = watch(group.files, { ignoreInitial: true, interval: watchInterval },
3837
parallel(
3938
function MoveViewsAndRegenerateJS() {
40-
var task = src(group.files)
41-
.pipe(rename(function(path) {
42-
path.dirname = path.dirname.toLowerCase();
43-
path.basename = path.basename.toLowerCase();
44-
path.extname = path.extname.toLowerCase();
45-
}));
39+
var task = src(group.files);
4640

4741
_.forEach(config.roots, function(root){
4842
var destPath = root + config.targets.views + group.folder;

0 commit comments

Comments
 (0)