Per-approved re-usability.

Only issue is controller being under documenttypes.
This commit is contained in:
Lars-Erik Aabech
2016-11-03 16:18:26 +01:00
parent c116da7545
commit c18c936820
3 changed files with 40 additions and 45 deletions

View File

@@ -7,17 +7,16 @@
"notificationsService",
"localizationService",
function (scope, injector, navigationService, notificationsService, localizationService) {
var notificationHeader,
resource = injector.get(scope.resource);
var notificationHeader;
function reportSuccessAndClose() {
function reportSuccessAndClose(treeName) {
var lastComma = scope.currentNode.path.lastIndexOf(","),
path = lastComma === -1
? scope.currentNode.path
: scope.currentNode.path.substring(0, lastComma - 1);
navigationService.syncTree({
tree: scope.tree,
tree: treeName,
path: path,
forceReload: true,
activate: true
@@ -37,18 +36,20 @@
navigationService.hideMenu();
}
localizationService.localize("renamecontainer_renamed")
.then(function(s) { notificationHeader = s; });
.then(function (s) { notificationHeader = s; });
scope.model = {
folderName: scope.currentNode.name
folderName: scope.currentNode.name
}
scope.renameContainer = function () {
scope.renameContainer = function (resourceKey, treeName) {
var resource = injector.get(resourceKey);
resource.renameContainer(scope.currentNode.id, scope.model.folderName)
.then(reportSuccessAndClose, function (err) {
.then(function () {
reportSuccessAndClose(treeName);
}, function (err) {
scope.error = err;
if (angular.isArray(err.data.notifications)) {
@@ -57,8 +58,6 @@
}
}
});
}
}
]);

View File

@@ -1,24 +1,22 @@
<div ng-init="resource = 'contentTypeResource'; tree = 'documenttypes'">
<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.ContentTypeContainers.RenameController" ng-cloak>
<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.ContentTypeContainers.RenameController" ng-cloak>
<div class="umb-pane">
<form novalidate name="renameFolderForm"
ng-submit="renameContainer()"
val-form-manager>
<div class="umb-pane">
<form novalidate name="renameFolderForm"
ng-submit="renameContainer('contentTypeResource', 'documenttypes')"
val-form-manager>
<div ng-show="error">
<h5 class="text-error">{{error.errorMsg}}</h5>
<p class="text-error">{{error.data.message}}</p>
</div>
<div ng-show="error">
<h5 class="text-error">{{error.errorMsg}}</h5>
<p class="text-error">{{error.data.message}}</p>
</div>
<umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
<input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
</umb-control-group>
<button type="submit" class="btn btn-primary"><localize key="general_rename">Rename</localize></button>
</form>
</div>
<umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
<input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
</umb-control-group>
<button type="submit" class="btn btn-primary"><localize key="general_rename">Rename</localize></button>
</form>
</div>
</div>

View File

@@ -1,23 +1,21 @@
<div ng-init="resource = 'mediaTypeResource'; tree = 'mediatypes'">
<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.ContentTypeContainers.RenameController" ng-cloak>
<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.ContentTypeContainers.RenameController" ng-cloak>
<div class="umb-pane">
<form novalidate name="renameFolderForm"
ng-submit="renameContainer()"
val-form-manager>
<div class="umb-pane">
<form novalidate name="renameFolderForm"
ng-submit="renameContainer('mediaTypeResource', 'mediatypes')"
val-form-manager>
<div ng-show="error">
<h5 class="text-error">{{error.errorMsg}}</h5>
<p class="text-error">{{error.data.message}}</p>
</div>
<div ng-show="error">
<h5 class="text-error">{{error.errorMsg}}</h5>
<p class="text-error">{{error.data.message}}</p>
</div>
<umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
<input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
</umb-control-group>
<button type="submit" class="btn btn-primary"><localize key="general_rename">Rename</localize></button>
</form>
</div>
<umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
<input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
</umb-control-group>
<button type="submit" class="btn btn-primary"><localize key="general_rename">Rename</localize></button>
</form>
</div>
</div>