Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EmonCMS 9.8.2 | 2017.03.03 #648

Merged
merged 3 commits into from Mar 4, 2017
Merged

EmonCMS 9.8.2 | 2017.03.03 #648

merged 3 commits into from Mar 4, 2017

Conversation

chaveiro
Copy link
Contributor

@chaveiro chaveiro commented Mar 3, 2017

Bug fixes
Added check for infinite recursive loops on process lists.
Added expanded tables support.
Added loading spinner across ui modules.

Bug fixes
Added check for infinite recursive loops on process lists.
Added expanded tables support.
Added loading spinner across ui modules.
@TrystanLea
Copy link
Member

Thanks @chaveiro looks great from a quick read through, shall I merge? I havent tested here yet.

@Paul-Reed
Copy link
Member

Paul-Reed commented Mar 3, 2017 via email

@TrystanLea
Copy link
Member

A quick test, I cant see any problems, it does require a new instance of settings.php.

@Paul-Reed
Copy link
Member

Works fine here, although;

Added expanded tables support.
Should we see a change? the tables appear and perform the same.

Added loading spinner across ui modules.
After throttling the network and loading the apps, I'm not seeing the spinner.
I can see via browser tools that ajax-loader.gif is loading - just can't see it.

js

@chaveiro
Copy link
Contributor Author

chaveiro commented Mar 4, 2017

Hi Paul, that is the app module, i did't touch it. Its on its own repo.

@Paul-Reed
Copy link
Member

Nuno, please forgive my ignorance, but which ui modules does it apply to? I don't see the spinner at all despite throttling the bandwidth.
If it doesn't apply to the apps, why are the apps loading ajax-loader.gif?

Paul

@chaveiro
Copy link
Contributor Author

chaveiro commented Mar 4, 2017

Hi, on this commit, the ajax-loader.gif is used only in place of the loading text that the input, feed and schedule modules used to shown while loading the table data.

@Paul-Reed
Copy link
Member

Aahh right. It's a very subtle change, as even on a weak 2G signal, I only glimpse the spinner for a fraction of a second. However, it may be more obvious under more hostile network circumstances.

Thanks Nuno, looks fine here, no problems.

Paul

@Paul-Reed
Copy link
Member

Paul-Reed commented Mar 4, 2017

Was just in the process of merging, but noticed that default.emonpi.settings.php has not been updated, and an emonpi update would therefore fail due to the config_file_version flag being incorrect. (also allow_config_env_vars missing).

EDIT - I'll add them after merging.

Paul

@Paul-Reed Paul-Reed merged commit 9a306cc into emoncms:master Mar 4, 2017
@glynhudson
Copy link
Member

Thanks guys. Nice work 👍

After a testing period I will merge into stable and handle an emonPi update. I'm thinking to perform and md5sum on the emonpi users settings.php to determine if it's been edited by the user. If it's not been edited by the user (probably most emonPi's) then we can safely swap out settings.php for default.emonpi.settings.php.

If the user has edited settings (md5sum compare fail) then I guess it will be down to the user to perform a manual update.

@jeremypoulter
Copy link

jeremypoulter commented Mar 5, 2017 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants