Skip to content

Commit 2f40410

Browse files
mazhalaimazhalai
committed
Merge remote-tracking branch 'ogresCE/MAGETWO-38402-stuck-in-readiness-check-php-setting' into PR_Branch
2 parents c753cd7 + 1fc3baa commit 2f40410

File tree

2 files changed

+124
-77
lines changed

2 files changed

+124
-77
lines changed

‎setup/pub/magento/setup/readiness-check.js

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,40 @@ angular.module('readiness-check', [])
2323
$rootScope.checkingInProgress = function() {
2424
return $scope.progressCounter > 0;
2525
};
26+
$scope.requestFailedHandler = function(obj) {
27+
obj.processed = true;
28+
obj.isRequestError = true;
29+
$scope.hasErrors = true;
30+
$rootScope.hasErrors = true;
31+
$scope.stopProgress();
32+
};
2633

2734
$scope.completed = false;
2835
$scope.hasErrors = false;
2936

3037
$scope.version = {
3138
visible: false,
3239
processed: false,
33-
expanded: false
40+
expanded: false,
41+
isRequestError: false
3442
};
3543
$scope.settings = {
3644
visible: false,
3745
processed: false,
38-
expanded: false
46+
expanded: false,
47+
isRequestError: false
3948
};
4049
$scope.extensions = {
4150
visible: false,
4251
processed: false,
43-
expanded: false
52+
expanded: false,
53+
isRequestError: false
4454
};
4555
$scope.permissions = {
4656
visible: false,
4757
processed: false,
48-
expanded: false
58+
expanded: false,
59+
isRequestError: false
4960
};
5061

5162
$scope.items = {
@@ -60,6 +71,9 @@ angular.module('readiness-check', [])
6071
angular.extend($scope.version, data);
6172
$scope.updateOnProcessed($scope.version.responseType);
6273
$scope.stopProgress();
74+
},
75+
fail: function() {
76+
$scope.requestFailedHandler($scope.version);
6377
}
6478
},
6579
'php-settings': {
@@ -73,6 +87,9 @@ angular.module('readiness-check', [])
7387
angular.extend($scope.settings, data);
7488
$scope.updateOnProcessed($scope.settings.responseType);
7589
$scope.stopProgress();
90+
},
91+
fail: function() {
92+
$scope.requestFailedHandler($scope.settings);
7693
}
7794
},
7895
'php-extensions': {
@@ -86,6 +103,9 @@ angular.module('readiness-check', [])
86103
angular.extend($scope.extensions, data);
87104
$scope.updateOnProcessed($scope.extensions.responseType);
88105
$scope.stopProgress();
106+
},
107+
fail: function() {
108+
$scope.requestFailedHandler($scope.extensions);
89109
}
90110
},
91111
'file-permissions': {
@@ -99,12 +119,16 @@ angular.module('readiness-check', [])
99119
angular.extend($scope.permissions, data);
100120
$scope.updateOnProcessed($scope.permissions.responseType);
101121
$scope.stopProgress();
122+
},
123+
fail: function() {
124+
$scope.requestFailedHandler($scope.permissions);
102125
}
103126
}
104127
};
105128

106129
$scope.isCompleted = function() {
107130
return $scope.version.processed
131+
&& $scope.settings.processed
108132
&& $scope.extensions.processed
109133
&& $scope.permissions.processed;
110134
};
@@ -133,8 +157,11 @@ angular.module('readiness-check', [])
133157
};
134158

135159
$scope.query = function(item) {
136-
return $http.get(item.url)
137-
.success(function(data) { item.process(data) });
160+
return $http.get(item.url, {timeout: 3000})
161+
.success(function(data) { item.process(data) })
162+
.error(function(data, status) {
163+
item.fail();
164+
});
138165
};
139166

140167
$scope.progress = function() {

‎setup/view/magento/setup/readiness-check/progress.phtml

Lines changed: 91 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,22 @@
6767

6868
<div class="readiness-check-content">
6969
<h3 class="readiness-check-title">PHP Version Check</h3>
70-
<p>
71-
Your PHP version is {{version.data.current}}. The required PHP version is {{version.data.required}}.
72-
<a href="#php-version" ng-click="updateOnExpand(version)">
73-
<span ng-hide="version.expanded">Show detail</span>
74-
<span ng-show="version.expanded">Hide detail</span>
75-
</a>
76-
</p>
77-
<p ng-show="version.expanded">
78-
Download and install PHP version {{version.data.required}} from <a href="http://www.php.net" target="_blank">www.php.net</a> using this <a href="http://www.php.net/docs.php" target="_blank">PHP Documentation</a>.
79-
</p>
80-
<p ng-show="version.expanded">If you need more help please call your hosting provider.</p>
70+
<div ng-show="version.isRequestError">
71+
<p>Server failed to respond. Please try again.</p>
72+
</div>
73+
<div ng-hide="version.isRequestError">
74+
<p>
75+
Your PHP version is {{version.data.current}}. The required PHP version is {{version.data.required}}.
76+
<a href="#php-version" ng-click="updateOnExpand(version)">
77+
<span ng-hide="version.expanded">Show detail</span>
78+
<span ng-show="version.expanded">Hide detail</span>
79+
</a>
80+
</p>
81+
<p ng-show="version.expanded">
82+
Download and install PHP version {{version.data.required}} from <a href="http://www.php.net" target="_blank">www.php.net</a> using this <a href="http://www.php.net/docs.php" target="_blank">PHP Documentation</a>.
83+
</p>
84+
<p ng-show="version.expanded">If you need more help please call your hosting provider.</p>
85+
</div>
8186
</div>
8287

8388
</div>
@@ -110,17 +115,22 @@
110115
<div class="readiness-check-item" ng-switch-default ng-init="updateOnError(settings)">
111116

112117
<span class="readiness-check-icon icon-failed-round"></span>
113-
<h3 class="readiness-check-title">PHP Settings Check</h3>
118+
<div class="readiness-check-content">
119+
<h3 class="readiness-check-title">PHP Settings Check</h3>
114120

115-
<div ng-repeat="setting in settings.data">
116-
<div ng-show="setting.error && setting.helpUrl" class="rediness-check-side">
117-
<p class="side-title">Need Help?</p>
118-
<a href="{{setting.helpUrl}}" target="_blank">PHP Documentation</a>
121+
<div ng-show="settings.isRequestError">
122+
<p>Server failed to respond. Please try again.</p>
119123
</div>
120-
<div ng-show="setting.error" class="readiness-check-content">
121-
<p>
122-
{{setting.message}}
123-
</p>
124+
<div ng-hide="settings.isRequestError" ng-repeat="setting in settings.data">
125+
<div ng-show="setting.error && setting.helpUrl" class="rediness-check-side">
126+
<p class="side-title">Need Help?</p>
127+
<a href="{{setting.helpUrl}}" target="_blank">PHP Documentation</a>
128+
</div>
129+
<div ng-show="setting.error">
130+
<p>
131+
{{setting.message}}
132+
</p>
133+
</div>
124134
</div>
125135
</div>
126136
</div>
@@ -178,32 +188,37 @@
178188

179189
<div class="readiness-check-content">
180190
<h3 class="readiness-check-title">PHP Extensions Check</h3>
181-
<p>
182-
{{extensions.data.missing.length}} missing PHP extensions.
183-
<a href="#php-extensions" ng-click="updateOnExpand(extensions)">
184-
<span ng-hide="extensions.expanded">Show detail</span>
185-
<span ng-show="extensions.expanded">Hide detail</span>
186-
</a>
187-
</p>
188-
<p>
189-
The best way to resolve this is to install the correct missing extensions. The exact fix depends on our server, your host, and other system variables.
190-
<br>
191-
Our <a href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html" target="_blank">PHP Extension Help</a> can get you started.
192-
</p>
193-
<p>
194-
If you need more help, please call your hosting provider.
195-
</p>
196-
<ul class="list" ng-show="extensions.expanded">
197-
<li
198-
class="list-item-icon"
199-
ng-repeat="name in extensions.data.required"
200-
ng-switch="extensions.data.missing.indexOf(name) >= 0"
201-
>
202-
<span ng-switch-when="true" class="icon-failed"></span>
203-
<span ng-switch-default class="icon-success"></span>
204-
PHP Extension {{name}}.
205-
</li>
206-
</ul>
191+
<div ng-show="extensions.isRequestError">
192+
<p>Server failed to respond. Please try again.</p>
193+
</div>
194+
<div ng-hide="extensions.isRequestError">
195+
<p>
196+
{{extensions.data.missing.length}} missing PHP extensions.
197+
<a href="#php-extensions" ng-click="updateOnExpand(extensions)">
198+
<span ng-hide="extensions.expanded">Show detail</span>
199+
<span ng-show="extensions.expanded">Hide detail</span>
200+
</a>
201+
</p>
202+
<p>
203+
The best way to resolve this is to install the correct missing extensions. The exact fix depends on our server, your host, and other system variables.
204+
<br>
205+
Our <a href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html" target="_blank">PHP Extension Help</a> can get you started.
206+
</p>
207+
<p>
208+
If you need more help, please call your hosting provider.
209+
</p>
210+
<ul class="list" ng-show="extensions.expanded">
211+
<li
212+
class="list-item-icon"
213+
ng-repeat="name in extensions.data.required"
214+
ng-switch="extensions.data.missing.indexOf(name) >= 0"
215+
>
216+
<span ng-switch-when="true" class="icon-failed"></span>
217+
<span ng-switch-default class="icon-success"></span>
218+
PHP Extension {{name}}.
219+
</li>
220+
</ul>
221+
</div>
207222
</div>
208223

209224
</div>
@@ -256,32 +271,37 @@
256271
<div class="readiness-check-content">
257272

258273
<h3 class="readiness-check-title">File Permission Check</h3>
259-
<p>
260-
{{permissions.data.required.length - permissions.data.current.length}} file permission not met.
261-
<a href="#php-permissions" ng-click="updateOnExpand(permissions)">
262-
<span ng-hide="permissions.expanded">Show detail</span>
263-
<span ng-show="permissions.expanded">Hide detail</span>
264-
</a>
265-
</p>
266-
<p>
267-
The best way to resolve this is to allow write permissions for the following Magento directories. The exact fix depends on your server, your host, and other system variables.
268-
<br>
269-
Our <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/composer-clone.html#instgde-prereq-compose-access" target="_blank">File Permission Help</a> can get you started.
270-
</p>
271-
<p>
272-
If you need more help, please call your hosting provider.
273-
</p>
274+
<div ng-show="permissions.isRequestError">
275+
<p>Server failed to respond. Please try again.</p>
276+
</div>
277+
<div ng-hide="permissions.isRequestError">
278+
<p>
279+
{{permissions.data.required.length - permissions.data.current.length}} file permission not met.
280+
<a href="#php-permissions" ng-click="updateOnExpand(permissions)">
281+
<span ng-hide="permissions.expanded">Show detail</span>
282+
<span ng-show="permissions.expanded">Hide detail</span>
283+
</a>
284+
</p>
285+
<p>
286+
The best way to resolve this is to allow write permissions for the following Magento directories. The exact fix depends on your server, your host, and other system variables.
287+
<br>
288+
Our <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/composer-clone.html#instgde-prereq-compose-access" target="_blank">File Permission Help</a> can get you started.
289+
</p>
290+
<p>
291+
If you need more help, please call your hosting provider.
292+
</p>
274293

275-
<ul class="list" ng-show="permissions.expanded">
276-
<li
277-
class="list-item-icon"
278-
ng-repeat="name in permissions.data.required"
279-
ng-switch="hasItem(permissions.data.current, name)">
280-
<span ng-switch-when="true" class="icon-success"></span>
281-
<span ng-switch-default class="icon-failed"></span>
282-
<span>"{{name}}" writable directory permission.</span>
283-
</li>
284-
</ul>
294+
<ul class="list" ng-show="permissions.expanded">
295+
<li
296+
class="list-item-icon"
297+
ng-repeat="name in permissions.data.required"
298+
ng-switch="hasItem(permissions.data.current, name)">
299+
<span ng-switch-when="true" class="icon-success"></span>
300+
<span ng-switch-default class="icon-failed"></span>
301+
<span>"{{name}}" writable directory permission.</span>
302+
</li>
303+
</ul>
304+
</div>
285305

286306
</div>
287307

0 commit comments

Comments
 (0)