Persist plugin management settings during update

Author: tomgreenfield

lib/bowermanager.js

@@ -301,19 +301,29 @@ BowerManager.prototype.importPackage = function (plugin, packageInfo, options, c
 
             // Add the package to the collection.
             // Check if a plugin with this name and version already exists.
-            db.retrieve(plugin.getPluginType(), { name: package.name, version: package.version }, function (err, results) {
+            db.retrieve(plugin.getPluginType(), {
+              name: package.name
+            }, function (err, results) {
               if (err) {
                 logger.log('error', err);
                 return callback(err);
               }
 
               if (results && results.length !== 0) {
+                var installedPlugin = results[0];
+
+                if (installedPlugin.version === package.version) {
                   // Don't add a duplicate.
                   if (options.strict) {
                     return callback("Can't add " + pluginString + ": verion already exists");
                   }
 
                   return callback(null);
+                }
+
+                var keysToPersist = [ '_isAvailableInEditor', '_isAddedByDefault' ];
+
+                keysToPersist.forEach(key => package[key] = installedPlugin[key]);
               }
 
               // Add the new plugin.

plugins/content/bower/index.js

@@ -879,7 +879,10 @@ function addPackage (plugin, packageInfo, options, cb) {
                 });
 
                 // Persist the _isAvailableInEditor flag.
-                db.update(plugin.type, {_id: newPlugin._id}, {_isAvailableInEditor: oldPlugin._isAvailableInEditor}, function(err, results) {
+                db.update(plugin.type, {_id: newPlugin._id}, {
+                  _isAvailableInEditor: oldPlugin._isAvailableInEditor,
+                  _isAddedByDefault: oldPlugin._isAddedByDefault
+                }, function(err, results) {
                   if (err) {
                     logger.log('error', err);
                     return addCb(err);