Fixing issue with dashboard river folder not being changeable or selectable.

Makefile

@@ -29,8 +29,9 @@ debug:
 	- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker attach ${newsblur}
 
 # brings down containers
-nb-down:
+down:
 	- docker-compose -f docker-compose.yml down
+nb-down: down
 
 # runs tests
 test:

apps/profile/models.py

@@ -1557,12 +1557,18 @@ class MCustomStyling(mongo.Document):
 
 
 class MDashboardRiver(mongo.Document):
-    user_id = mongo.IntField(unique_with=('river_id', 'river_side', 'river_order'))
+    user_id = mongo.IntField(unique_with=())
     river_id = mongo.StringField()
     river_side = mongo.StringField()
     river_order = mongo.IntField()
 
     meta = {
+        'collection': 'dashboard_river',
+        'allow_inheritance': False,
+        'indexes': ['user_id', 
+                    {'fields': ['user_id', 'river_id', 'river_side', 'river_order'], 
+                     'unique': True,
+                    }],
         'ordering': ['river_order']
     }
 
@@ -1584,25 +1590,12 @@ class MDashboardRiver(mongo.Document):
     def get_user_rivers(cls, user_id):
         return cls.objects(user_id=user_id)
 
-    @classmethod
-    def get_user_by_river_id(cls, user_id, river_id=None, river_side=None, river_order=None):
-        if river_id:
-            try:
-                return cls.objects.get(user_id=user_id, river_id=river_id)
-            except MDashboardRiver.DoesNotExist:
-                return None
-        elif river_side and river_order:
-            try:
-                return cls.objects.get(user_id=user_id, river_side=river_side, river_order=river_order)
-            except MDashboardRiver.DoesNotExist:
-                return None
-
     @classmethod
     def save_user(cls, user_id, river_id, river_side, river_order):
-        river = None
-
-        if not river:
-            river = cls.get_user_by_river_id(user_id, river_side=river_side, river_order=river_order)
+        try:
+            river = cls.objects.get(user_id=user_id, river_side=river_side, river_order=river_order)
+        except cls.DoesNotExist:
+            river = None
         
         if not river:
             river = cls.objects.create(user_id=user_id, river_id=river_id, 

media/js/newsblur/reader/reader_utils.js

@@ -177,7 +177,7 @@ NEWSBLUR.utils = {
                              $feeds_optgroup);
             
             if (feed.id == current_feed_id) {
-                $option.prop('selected', true);
+                $option.attr('selected', true);
             }
         };
         
@@ -216,7 +216,6 @@ NEWSBLUR.utils = {
             $chooser.append($folders_optgroup);
         }
         $chooser.append($feeds_optgroup);
-        $chooser.append($feeds_optgroup);
         if (!options.skip_social) {
             $chooser.append($social_feeds_optgroup);
         }
@@ -227,10 +226,15 @@ NEWSBLUR.utils = {
             $chooser.append($starred_feeds_optgroup);
         }
 
+        if (options.feed_id) {
+            $chooser.val(options.feed_id);
+        }
+
         return $chooser;
     },
     
-    make_folders: function(selected_folder_title, toplevel, select_name, include_special_folders) {
+    make_folders: function (selected_folder_title, toplevel, select_name, include_special_folders) {
+        // console.log('make_folders', selected_folder_title);
         var folders = NEWSBLUR.assets.get_folders();
         var $options = $.make('select', { className: 'NB-folders', name: select_name });
         
@@ -238,26 +242,26 @@ NEWSBLUR.utils = {
             var $option = $.make('option', { value: 'river:global' }, "Global Shared Stories");
             $options.append($option);
             if (selected_folder_title == "river:global") {
-                $option.prop('selected', true);
+                $option.attr('selected', true);
             }
             
             var $option = $.make('option', { value: 'river:blurblogs' }, "All Shared Stories");
             $options.append($option);    
             if (selected_folder_title == "river:blurblogs") {
-                $option.prop('selected', true);
+                $option.attr('selected', true);
             }
 
             var $option = $.make('option', { value: 'river:infrequent' }, "Infrequent Site Stories");
             $options.append($option);    
             if (selected_folder_title == "river:infrequent") {
-                $option.prop('selected', true);
+                $option.attr('selected', true);
             }
         }
 
         var $option = $.make('option', { value: 'river:' }, toplevel || "Top Level");
         $options.append($option);
         if (selected_folder_title == "river:") {
-            $option.prop('selected', true);
+            $option.attr('selected', true);
         }
 
         $options = this.make_folder_options($options, folders, '   ', selected_folder_title);
@@ -274,7 +278,7 @@ NEWSBLUR.utils = {
                 }, depth + ' ' + item.get('folder_title'));
                 $options.append($option);
                 if (item.get('folder_title') == selected_folder_title) {
-                    $option.prop('selected', true);
+                    $option.attr('selected', true);
                 }
                 $options = self.make_folder_options($options, item.folders, depth+'   ', selected_folder_title);
             }

media/js/newsblur/views/feed_options_popover.js

@@ -41,6 +41,9 @@ NEWSBLUR.FeedOptionsPopover = NEWSBLUR.ReaderPopover.extend({
             this.options.feed_id = "starred"; // Ignore tags
             this.options['show_readfilter'] = false;
         }
+        
+        // console.log("Opening feed options", this.options, this.options.feed_id);
+        
         NEWSBLUR.ReaderPopover.prototype.initialize.call(this, this.options);
         this.model = NEWSBLUR.assets;
         this.render();

newsblur_web/settings.py

@@ -749,7 +749,7 @@ JAMMIT = jammit.JammitAssets(ROOT_DIR)
 
 if DEBUG:
     MIDDLEWARE += ('utils.request_introspection_middleware.DumpRequestMiddleware',)
-    MIDDLEWARE += ('utils.exception_middleware.ConsoleExceptionMiddleware',)
+    # MIDDLEWARE += ('utils.exception_middleware.ConsoleExceptionMiddleware',)
 
 # =======
 # = AWS =