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

Add auto-refresh on index page #99

Merged
merged 1 commit into from
Dec 5, 2015
Merged

Add auto-refresh on index page #99

merged 1 commit into from
Dec 5, 2015

Conversation

timlittle
Copy link
Contributor

Add an auto refresh to the index page.

@daenney
Copy link
Member

daenney commented Nov 20, 2014

I'm willing to accept this if and only if it's configurable through settings.py and with the ability to completely disable it.

I personally really dislike sites that just decide to auto-refresh on me because this always happens at the exact moment you're trying to copy-paste something.

@k2patel
Copy link

k2patel commented Nov 20, 2014

i'm user but i agree, it is only usefull if i can control it.

@timlittle
Copy link
Contributor Author

Thanks for the suggestion.
I have implemented the changes into the pull-request.

Setting REFRESH_RATE to 0 will disable the refreshing.

@daenney
Copy link
Member

daenney commented Nov 21, 2014

Perfect.

Two things:

  • Could you add a little piece of documentation to the README about it so people don't suddenly get this behaviour without a fair warning? There's a section about the available configuration settings that might be worth looking into in which this should fit nicely.
  • Could you squash all the commits together into one? This is one feature so I'd like to limit it to one commit history wise.

@fgimian
Copy link
Contributor

fgimian commented May 10, 2015

Hmm, I don't think we should do this for refreshing personally. Instead, we really need to investigate an AJAX-based solution like Angular.js or similar. I'll test this out tomorrow but I'm pretty set on using a strategy that involved Javascript to dynamically update elements on the page instead of refreshing the entire page via a meta tag.

@fgimian fgimian mentioned this pull request May 10, 2015
@corey-hammerton corey-hammerton mentioned this pull request May 13, 2015
@nibalizer
Copy link
Member

I am personally happy with this solution until an AJAX solution emerges. @tjayL can you rebase this and we can merge it?

@nibalizer
Copy link
Member

@tjayL rebase?

@timlittle
Copy link
Contributor Author

Sorry dude,
I have put all my changes in 245e625

@bastelfreak
Copy link
Member

@tjayL could you take a look again? it seems like a rebase is needed here.

@timlittle
Copy link
Contributor Author

I am unsure what you are expecting of me here. I have put all of the changes for this into one commit.

If i do a git rebase i only get 'Current branch master is up to date.'

@bastelfreak
Copy link
Member

You've to do a rebase against the master:

git checkout master
git pull upstream # to update your master to the latest one from this remote, not your fork
git checkout auto-refresh
git rebase -i master

this is untested and based on my memory, use the commands with caution. If you experience any issues you can ask here or also in #puppet-community on freenode

@timlittle
Copy link
Contributor Author

Thanks bastelfreak.

I have done that and pushed it back to my repo.

@bastelfreak
Copy link
Member

did you push it in the wrong branch? I can't see anything changed here :(

git is pure magic

@timlittle
Copy link
Contributor Author

I pushed it into the master branch on my repo:

git remote -v
origin  https://github.com/tjayl/puppetboard.git (fetch)
origin  https://github.com/tjayl/puppetboard.git (push)
git branch -v
  auto-refresh 245e625 Add auto refresh to the index page
* master       245e625 Add auto refresh to the index page

@janorn
Copy link

janorn commented Dec 3, 2015

You need to add the original repo as an upstream.

https://help.github.com/articles/configuring-a-remote-for-a-fork/

@janorn
Copy link

janorn commented Dec 3, 2015

@timlittle
Copy link
Contributor Author

Thanks for those guides.

I think i have managed to do it.

@bastelfreak
Copy link
Member

After the rebase you've to push (probably push -f) into your auto-refresh branch, than the changes will appear here. I can't see anything changed here. If you want, we can fiddle that out if you join #puppet-community.

@timlittle
Copy link
Contributor Author

Got it.

If there are still issues, i will jump on IRC to resolve them

@bastelfreak
Copy link
Member

great, you based it \o/

but you missed two pieces off git diff code. could you rebase again and squash it down to one commit?

envs=envs,
current_env=env
>>>>>>> f63a0cefcb71dfcd309fa508837dc131f90862a4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove this line

@timlittle
Copy link
Contributor Author

rebase done

@bastelfreak
Copy link
Member

the code looks fine, could you squash the two commits into one? Than we should finally be ready to merge \o/

@janorn
Copy link

janorn commented Dec 3, 2015

@timlittle timlittle closed this Dec 4, 2015
@timlittle timlittle reopened this Dec 4, 2015
@timlittle
Copy link
Contributor Author

It doesn't seem to want to squash 245e625 and d44152f

I am guessing because 245e625 was committed over a year ago

@bastelfreak
Copy link
Member

Would it be possible for you to create a new branch with just a single commit and a new PR? That could be easier than squashing this one.

@timlittle timlittle closed this Dec 4, 2015
@timlittle timlittle reopened this Dec 4, 2015
@timlittle
Copy link
Contributor Author

Done it (at last)

@bastelfreak
Copy link
Member

thanks, looks perfect!
can somebody merge this or do the docs need to be extended?

nibalizer added a commit that referenced this pull request Dec 5, 2015
Add auto-refresh on index page
@nibalizer nibalizer merged commit f5ff5b3 into voxpupuli:master Dec 5, 2015
b4ldr pushed a commit to b4ldr/puppetboard that referenced this pull request Feb 19, 2020
* Version bump to 0.3.0

* pypuppetdb: Version bump to 0.3.1
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

7 participants