Skip to content

Commit

Permalink
Merge pull request #8601 from umbraco/v8/bugfix/publishdescendants
Browse files Browse the repository at this point in the history
Fixing publish descendants dialog
  • Loading branch information
Claus authored Aug 7, 2020
2 parents 1e29b5f + c73f9bc commit 39fcdb0
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,7 @@
view: "views/content/overlays/unpublish.html",
variants: $scope.content.variants, //set a model property for the dialog
skipFormValidation: true, //when submitting the overlay form, skip any client side validation
includeUnpublished: false,
submitButtonLabelKey: "content_unpublish",
submitButtonStyle: "warning",
submit: function (model) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,28 @@

var vm = this;

vm.includeUnpublished = false;
vm.includeUnpublished = $scope.model.includeUnpublished || false;

vm.changeSelection = changeSelection;
vm.toggleIncludeUnpublished = toggleIncludeUnpublished;


function onInit() {

vm.variants = $scope.model.variants;
vm.displayVariants = vm.variants.slice(0);// shallow copy, we dont want to share the array-object(because we will be performing a sort method) but each entry should be shared (because we need validation and notifications).
vm.displayVariants = vm.variants.slice(0); // shallow copy, we don't want to share the array-object (because we will be performing a sort method) but each entry should be shared (because we need validation and notifications).
vm.labels = {};

// get localized texts for use in directives
if (!$scope.model.title) {
localizationService.localize("buttons_publishDescendants").then(function (value) {
$scope.model.title = value;
});
}
if (!vm.labels.includeUnpublished) {
localizationService.localize("content_includeUnpublished").then(function (value) {
vm.labels.includeUnpublished = value;
});
}

_.each(vm.variants, function (variant) {
variant.isMandatory = isMandatoryFilter(variant);
Expand Down Expand Up @@ -72,8 +77,9 @@
}

function toggleIncludeUnpublished() {
console.log("toggleIncludeUnpublished")
vm.includeUnpublished = !vm.includeUnpublished;
// make sure this value is pushed back to the scope
$scope.model.includeUnpublished = vm.includeUnpublished;
}

/** Returns true if publishing is possible based on if there are un-published mandatory languages */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
</div>

<div class="flex mb3">
<umb-toggle
checked="vm.includeUnpublished"
on-click="vm.toggleIncludeUnpublished()"
class="mr2"
/>
<localize key="content_includeUnpublished"></localize>
<umb-toggle checked="vm.includeUnpublished"
on-click="vm.toggleIncludeUnpublished()"
class="mr2"
label-on="{{vm.labels.includeUnpublished}}"
label-off="{{vm.labels.includeUnpublished}}"
label-position="right"
show-labels="true"></umb-toggle>
</div>

</div>
Expand All @@ -23,12 +24,13 @@
</div>

<div class="flex mb3">
<umb-toggle
checked="vm.includeUnpublished"
on-click="vm.toggleIncludeUnpublished()"
class="mr2"
/>
<localize key="content_includeUnpublished"></localize>
<umb-toggle checked="vm.includeUnpublished"
on-click="vm.toggleIncludeUnpublished()"
class="mr2"
label-on="{{vm.labels.includeUnpublished}}"
label-off="{{vm.labels.includeUnpublished}}"
label-position="right"
show-labels="true"></umb-toggle>
</div>

<div class="umb-list umb-list--condensed">
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
<key alias="addTextBox">Tilføj en ny tekstboks</key>
<key alias="removeTextBox">Fjern denne tekstboks</key>
<key alias="contentRoot">Indholdsrod</key>
<key alias="includeUnpublished">Medtag udkast: udgiv også ikke-publicerede sider.</key>
<key alias="includeUnpublished">Inkluder ikke-udgivet indhold.</key>
<key alias="isSensitiveValue">Denne værdi er skjult.Hvis du har brug for adgang til at se denne værdi, bedes du kontakte din web-administrator.</key>
<key alias="isSensitiveValue_short">Denne værdi er skjult.</key>
<key alias="languagesToPublishForFirstTime">Hvilke sprog vil du gerne udgive? Alle sprog med indhold gemmes!</key>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
<key alias="addTextBox">Add another text box</key>
<key alias="removeTextBox">Remove this text box</key>
<key alias="contentRoot">Content root</key>
<key alias="includeUnpublished">Include drafts and unpublished content items.</key>
<key alias="includeUnpublished">Include unpublished content items.</key>
<key alias="isSensitiveValue">This value is hidden. If you need access to view this value please contact your website administrator.</key>
<key alias="isSensitiveValue_short">This value is hidden.</key>
<key alias="languagesToPublishForFirstTime">What languages would you like to publish? All languages with content are saved!</key>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
<key alias="addTextBox">Add another text box</key>
<key alias="removeTextBox">Remove this text box</key>
<key alias="contentRoot">Content root</key>
<key alias="includeUnpublished">Include drafts and unpublished content items.</key>
<key alias="includeUnpublished">Include unpublished content items.</key>
<key alias="isSensitiveValue">This value is hidden. If you need access to view this value please contact your website administrator.</key>
<key alias="isSensitiveValue_short">This value is hidden.</key>
<key alias="languagesToPublishForFirstTime">What languages would you like to publish? All languages with content are saved!</key>
Expand Down

0 comments on commit 39fcdb0

Please sign in to comment.