Update services SQL #3205

Merged
merged 3 commits into from Mar 9, 2016

Projects

None yet

4 participants

@f0o
Member
f0o commented Mar 9, 2016

Fixes #3202

array_merge fails if the 2nd parameter is being unset before

@f0o f0o Update services SQL
4a79348
@f0o f0o Updated UI
1a59171
@f0o f0o added WebUI and removed Blocker labels Mar 9, 2016
@f0o
Member
f0o commented Mar 9, 2016

Ready for merge, works on CI

@murrant murrant commented on the diff Mar 9, 2016
check-services.php
@@ -48,13 +48,9 @@
if ($service_status != $status) {
$update['service_changed'] = time();
}
- else {
- unset($updated);
@murrant
murrant Mar 9, 2016 Contributor

@f0o What was this even doing? Did the $updated variable exist?

@f0o
f0o Mar 9, 2016 Member

I think that else was a relict anyways. figured the main issue here was the webui part that pulled the wrong var.

@murrant murrant commented on an outdated diff Mar 9, 2016
html/includes/print-service.inc.php
@@ -70,7 +70,7 @@
<span class='box-desc'>$desc</span>
</td>
<td>
- <span class='box-desc'>".date('r',$service['service_changed'])."</span>
+ <span class='box-desc'>".date('r',$service['service_checked'])."</span>
@murrant
murrant Mar 9, 2016 Contributor

Shouldn't this just be <span class='box-desc'>$checked</span>?

@f0o f0o Updated UI again
4ce1b43
@laf laf merged commit e121dc4 into master Mar 9, 2016

4 checks passed

Auto-Deploy Build finished. No test results found.
Details
Scrutinizer No new issues
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@laf laf deleted the f0o-service-update branch Mar 9, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment