Revert "bugs fixes as highlighted by Kashif in edx-notifications"

openedx-unsupported · Mar 31, 2015 · e07c06c · e07c06c
1 parent 5a8bfee
commit e07c06c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/edx_notifications/server/web/static/edx_notifications/js/views/counter_icon_view.js b/edx_notifications/server/web/static/edx_notifications/js/views/counter_icon_view.js
@@ -132,14 +132,8 @@ var CounterIconView = Backbone.View.extend({
                  notification_alert.play();
              }
              counterView.render();
-             if (counterView.notification_pane && counterView.notification_pane.selected_pane == "unread") {
-                 var url = counterView.options.endpoints.user_notifications_unread_only;
-                 counterView.notification_pane.collection.url = url;
-
-                 // apply namespacing - if set
-                 if (counterView.namespace) {
-                      counterView.notification_pane.collection.url = counterView.notification_pane.append_url_param(url, 'namespace', counterView.namespace)
-                 }
+             if (counterView.notification_pane) {
+                 counterView.notification_pane.collection.url = counterView.options.endpoints.user_notifications_unread_only;
                  counterView.notification_pane.hydrate();
              }
          }

diff --git a/edx_notifications/server/web/static/edx_notifications/js/views/notification_pane_view.js b/edx_notifications/server/web/static/edx_notifications/js/views/notification_pane_view.js
@@ -442,7 +442,7 @@ var NotificationPaneView = Backbone.View.extend({
                     self.render();
 
                     // fetch the latest notification count
-                     self.counter_icon_view.refresh();
+                    self.counter_icon_view.model.fetch();
                 }
             }
         );