Merge c88d193 into b400326

Makefile

@@ -6,10 +6,12 @@ sync: up
 	# set up the database tablea
 	docker-compose exec cartoview python manage.py migrate
 	docker-compose exec cartoview python manage.py loaddata sample_admin.json
-	docker-compose exec cartoview python manage.py loaddata default_oauth_apps.json
+	docker-compose exec cartoview python manage.py loaddata default_oauth_apps_docker.json
 	docker-compose exec cartoview python manage.py loaddata app_stores.json
 	docker-compose exec cartoview python manage.py loaddata initial_data.json
 
+backfill_api_keys:
+	docker-compose exec cartoview python manage.py backfill_api_keys
 
 prepare_manager: up
         #make migration for app_manager
@@ -34,7 +36,12 @@ reset: down up wait sync
 
 collect_static: up
 	docker-compose exec cartoview python manage.py collectstatic --noinput
-run: up wait prepare_manager sync collect_static
+
+prepare_oauth:
+	docker-compose exec cartoview paver prepare_docker_oauth_fixture
+	docker-compose exec cartoview paver install_docker_data_dir
+
+run: up wait prepare_oauth prepare_manager sync collect_static backfill_api_keys
 
 static_db: up sync wait collect_static
 

cartoview/app_manager/installer.py

@@ -71,13 +71,16 @@ def restart_server(cls):
     def cherry_restart(cls):
         try:
             import cherrypy
-            cherrypy.engine.restart()
+            # completely stop the cherrypy server instead of reloading
+            # to avoid waiting to stop used threads error
+            cherrypy.engine.stop()
+            cherrypy.engine.start()
         except ImportError:
             exit(0)
 
 
 def remove_unwanted(info):
-    dictionary = info.__dict__.get('_data', {})
+    dictionary = info.__dict__.get('_data', {}) if info else {}
     app_fields = [
         str(field.name)
         for field in sorted(App._meta.fields + App._meta.many_to_many)
@@ -139,7 +142,7 @@ def get_store(self, store_id=None):
 
     def get_app_version(self):
         if not self.version or self.version == 'latest' or \
-                self.info.latest_version.version == self.version:
+        (self.info and self.info.latest_version.version == self.version):
             self.version = self.info.latest_version
         else:
             data = self._request_rest_data("appversion/?app__name=", self.name,

cartoview/app_manager/rest.py

@@ -97,6 +97,7 @@ class AppResource(ModelResource):
     store = fields.ForeignKey(AppStoreResource, 'store', full=False, null=True)
     order = fields.IntegerField()
     active = fields.BooleanField()
+    pending = fields.BooleanField()
     categories = fields.ListField()
 
     default_config = fields.DictField(default={})
@@ -119,6 +120,11 @@ def dehydrate_active(self, bundle):
             active = bundle.obj.config.active
         return active
 
+    def dehydrate_pending(self, bundle):
+        app = bundle.obj
+        cartoview_app = CartoviewApp.objects.get(app.name)
+        return cartoview_app.pending
+
     def dehydrate_categories(self, bundle):
         return [category.name for category in bundle.obj.category.all()]
 

cartoview/app_manager/settings.py

@@ -48,10 +48,10 @@ def load_apps(APPS_DIR):
                     APPS_SETTINGS += (app_settings_file,)
                 if os.path.exists(libs_dir) and libs_dir not in sys.path:
                     logger.info(
-                        "Install {} libs folder to the system.\n".format(
+                        "Append {} libs folder to the system path.\n".format(
                             app.name))
                     sys.path.append(libs_dir)
-                logger.info("add {} to INSTALLED_APPS.\n".format(app.name))
+                logger.info("add {} to django INSTALLED_APPS.\n".format(app.name))
                 if app.name not in CARTOVIEW_APPS:
                     # app_config.name.__str__() because Django don't like
                     # unicode_literals

cartoview/app_manager/static/app_manager/css/manager.css

@@ -625,6 +625,7 @@ div {
 .actions-wrapper {
   margin-top: 10px;
   padding: 0 10px;
+  min-height: 30px;
 }
 .actions-wrapper button {
   margin-right: 10px;