yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2241 from marcemarc/temp-u4-10537

Browse Source 
U4-10537 - Enable editor to skip Macro Selection step, when there is only one macro, and it has parameters
This commit is contained in:
Sebastiaan Janssen
2018-07-25 21:56:11 +02:00
committed by GitHub
parent 4ca88e48c2 0752ef06b1
commit b39b724303
2 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
View File

@@ -10,16 +10,22 @@
function InsertMacroController($scope, entityResource, macroResource, umbPropEditorHelper, macroService, formHelper) {
/** changes the view to edit the params of the selected macro */
function editParams() {
/** if there is pnly one macro, and it has parameters - editor can skip selecting the Macro **/
function editParams(insertIfNoParameters) {
//whether to insert the macro in the rich text editor when editParams is called and there are no parameters see U4-10537
insertIfNoParameters = (typeof insertIfNoParameters !== 'undefined') ? insertIfNoParameters : true;
//get the macro params if there are any
macroResource.getMacroParameters($scope.selectedMacro.id)
.then(function (data) {
//go to next page if there are params otherwise we can just exit
if (!angular.isArray(data) || data.length === 0) {
//we can just exist!
submitForm();
//we can just exist!
if (insertIfNoParameters) {
submitForm();
} else {
$scope.wizardStep = 'macroSelect';
}
} else {
$scope.wizardStep = "paramSelect";
$scope.macroParams = data;
@@ -117,7 +123,7 @@ function InsertMacroController($scope, entityResource, macroResource, umbPropEdi
formHelper.resetForm({ scope: $scope });
if ($scope.wizardStep === "macroSelect") {
editParams();
editParams(true);
}
else {
submitForm();
@@ -155,12 +161,19 @@ function InsertMacroController($scope, entityResource, macroResource, umbPropEdi
if (found) {
//select the macro and go to next screen
$scope.selectedMacro = found;
editParams();
editParams(true);
return;
}
}
//we don't have a pre-selected macro so ensure the correct step is set
$scope.wizardStep = "macroSelect";
//if there is only one macro in the site and it has parameters, let's not make the editor choose it from a selection of one macro (unless there are no parameters - then weirdly it's a better experience to make that selection)
if ($scope.macros.length == 1) {
$scope.selectedMacro = $scope.macros[0];
editParams(false);
}
else {
//we don't have a pre-selected macro so ensure the correct step is set
$scope.wizardStep = 'macroSelect';
}
});

26
src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js
View File

@@ -17,14 +17,17 @@ function MacroPickerController($scope, entityResource, macroResource, umbPropEdi
$scope.model.selectedMacro = macro;
if ($scope.wizardStep === "macroSelect") {
editParams();
editParams(true);
} else {
$scope.model.submit($scope.model);
}
};
/** changes the view to edit the params of the selected macro */
function editParams() {
/** if there is pnly one macro, and it has parameters - editor can skip selecting the Macro **/
function editParams(insertIfNoParameters) {
//whether to insert the macro in the rich text editor when editParams is called and there are no parameters see U4-10537
insertIfNoParameters = (typeof insertIfNoParameters !== 'undefined') ? insertIfNoParameters : true;
//get the macro params if there are any
macroResource.getMacroParameters($scope.model.selectedMacro.id)
.then(function (data) {
@@ -34,7 +37,11 @@ function MacroPickerController($scope, entityResource, macroResource, umbPropEdi
//go to next page if there are params otherwise we can just exit
if (!angular.isArray(data) || data.length === 0) {
$scope.model.submit($scope.model);
if (insertIfNoParameters) {
$scope.model.submit($scope.model);
} else {
$scope.wizardStep = 'macroSelect';
}
} else {
@@ -113,12 +120,19 @@ function MacroPickerController($scope, entityResource, macroResource, umbPropEdi
if (found) {
//select the macro and go to next screen
$scope.model.selectedMacro = found;
editParams();
editParams(true);
return;
}
}
//we don't have a pre-selected macro so ensure the correct step is set
$scope.wizardStep = "macroSelect";
//if there is only one macro in the site and it has parameters, let's not make the editor choose it from a selection of one macro (unless there are no parameters - then weirdly it's a better experience to make that selection)
if ($scope.macros.length == 1) {
$scope.model.selectedMacro = $scope.macros[0];
editParams(false);
}
else {
//we don't have a pre-selected macro so ensure the correct step is set
$scope.wizardStep = 'macroSelect';
}
});