Fix unhandled exceptions from store

NoOrgId exception was thrown but not handled in some cases. We don't really need this exception, so just use NoStoreException instead which is already handled correctly.

circle/dashboard/store_api.py

@@ -44,18 +44,12 @@ class NoStoreException(StoreApiException):
     pass
 
 
-class NoOrgIdException(StoreApiException):
-    pass
-
-
 class Store(object):
 
     def __init__(self, user, default_timeout=0.5):
         self.store_url = settings.STORE_URL
-        if not self.store_url:
+        if not self.store_url or not user.profile.org_id:
             raise NoStoreException
-        if not user.profile.org_id:
-            raise NoOrgIdException
         self.username = 'u-%s' % user.profile.org_id
         self.request_args = {'verify': settings.STORE_VERIFY_SSL}
         if settings.STORE_SSL_AUTH:

circle/dashboard/views/store.py

@@ -36,7 +36,7 @@ from django.views.generic import TemplateView
 from braces.views import LoginRequiredMixin
 
 from ..store_api import (Store, NoStoreException,
-                         NotOkException, NoOrgIdException)
+                         NotOkException)
 
 logger = logging.getLogger(__name__)
 
@@ -71,11 +71,6 @@ class StoreList(LoginRequiredMixin, TemplateView):
                 return super(StoreList, self).get(*args, **kwargs)
         except NoStoreException:
             messages.warning(self.request, _("No store."))
-        except NoOrgIdException:
-            messages.warning(self.request,
-                             _("Your organization ID is not set."
-                               " To use the store, you need a"
-                               " unique organization ID."))
         except NotOkException:
             messages.warning(self.request, _("Store has some problems now."
                                              " Try again later."))