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

Fixes the order that descriptions are listed during install

Browse Source
This commit is contained in:
Shannon
2014-03-04 19:28:57 +11:00
parent d2aecd12eb
commit 0d93db5f1f
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Web.UI.Client/src/installer/installer.service.js
View File

@@ -16,6 +16,18 @@ angular.module("umbraco.install").factory('installerService', function($q, $time
}
};
/*
Returns the description for the step at a given index based on the order of the serverOrder of steps
Since they don't execute on the server in the order that they are displayed in the UI.
*/
function getDescriptionForStepAtIndex(steps, index) {
var sorted = _.sortBy(steps, "serverOrder");
if (sorted[index]) {
return sorted[index].description;
}
return null;
}
var service = {
status : _status,
@@ -105,7 +117,7 @@ angular.module("umbraco.install").factory('installerService', function($q, $time
service.status.loading = true;
var feedback = 0;
service.status.feedback = service.status.steps[0].description;
service.status.feedback = getDescriptionForStepAtIndex(service.status.steps, 0);
function processInstallStep(){
$http.post(Umbraco.Sys.ServerVariables.installApiBaseUrl + "PostPerformInstall",
@@ -113,9 +125,9 @@ angular.module("umbraco.install").factory('installerService', function($q, $time
if(!response.data.complete){
feedback++;
var step = service.status.steps[feedback];
if(step){
service.status.feedback = step.description;
var desc = getDescriptionForStepAtIndex(service.status.steps, feedback);
if (desc) {
service.status.feedback = desc;
}
processInstallStep();