public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into circular

Browse source 
* master:
  Fixing broken move to folder.
  Adding setup_all for single machine installations.
  Fixing original view, broken during backbone upgrade.
  Upgrading to latest Backbone and Underscore. May break shit.
This commit is contained in:
Samuel Clay 2013-01-22 10:15:27 -08:00
commit cf90e8f765
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
fabfile.py vendored
View file

@ -310,8 +310,15 @@ def setup_common():
configure_nginx() configure_nginx()
setup_munin() setup_munin()
def setup_app(): def setup_all():
setup_common() setup_common()
setup_app(skip_common=True)
setup_db(skip_common=True)
setup_task(skip_common=True)
def setup_app(skip_common=False):
if not skip_common:
setup_common()
setup_vps() setup_vps()
setup_app_firewall() setup_app_firewall()
setup_app_motd() setup_app_motd()
@ -325,24 +332,26 @@ def setup_app():
deploy() deploy()
config_monit_app() config_monit_app()
def setup_db(): def setup_db(skip_common=False):
setup_common() if not skip_common:
setup_common()
setup_baremetal() setup_baremetal()
setup_db_firewall() setup_db_firewall()
setup_db_motd() setup_db_motd()
copy_task_settings() copy_task_settings()
# setup_memcached() setup_memcached()
# setup_postgres(standby=False) setup_postgres(standby=False)
setup_mongo() setup_mongo()
# setup_gunicorn(supervisor=False) setup_gunicorn(supervisor=False)
# setup_redis() setup_redis()
setup_db_munin() setup_db_munin()
if env.user == 'ubuntu': # if env.user == 'ubuntu':
setup_db_mdadm() # setup_db_mdadm()
def setup_task(): def setup_task(skip_common=False):
setup_common() if not skip_common:
setup_common()
setup_vps() setup_vps()
setup_task_firewall() setup_task_firewall()
setup_task_motd() setup_task_motd()

4
media/js/newsblur/common/assetmodel.js
View file

@ -930,7 +930,7 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
move_feed_to_folder: function(feed_id, in_folder, to_folder, callback) { move_feed_to_folder: function(feed_id, in_folder, to_folder, callback) {
var pre_callback = _.bind(function(data) { var pre_callback = _.bind(function(data) {
this.folders.reset(data.folders); this.folders.reset(_.compact(data.folders), {parse: true});
return callback(); return callback();
}, this); }, this);
@ -943,7 +943,7 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
move_folder_to_folder: function(folder_name, in_folder, to_folder, callback) { move_folder_to_folder: function(folder_name, in_folder, to_folder, callback) {
var pre_callback = _.bind(function(data) { var pre_callback = _.bind(function(data) {
this.folders.reset(data.folders); this.folders.reset(_.compact(data.folders), {parse: true});
return callback(); return callback();
}, this); }, this);