Unwanted Portal Types in 'Add Remote' View.

src/senaite/sync/browser/add.py

@@ -57,15 +57,23 @@ def __call__(self):
             import_users = True if form.get("import_users") == 'on' else False
             import_registry = True if form.get("import_registry") == 'on' else False
             content_types = form.get("content_types", None)
+            unwanted_content_types = form.get("unwanted_content_types", None)
             prefix = form.get("prefix", None)
             prefixable_types = form.get("prefixable_types", None)
 
+            portal_types = api.get_tool("portal_types")
+
             # Content Type Validation
             if content_types is not None:
                 content_types = [t.strip() for t in content_types.split(",")]
-                portal_types = api.get_tool("portal_types")
                 content_types = filter(lambda ct: ct in portal_types,
                                        content_types)
+            # Content Type Validation
+            if unwanted_content_types is not None:
+                unwanted_content_types = [t.strip() for t
+                                          in unwanted_content_types.split(",")]
+                unwanted_content_types = filter(lambda ct: ct in portal_types,
+                                                unwanted_content_types)
 
             # Prefix Validation
             if prefix:
@@ -84,7 +92,6 @@ def __call__(self):
                     return self.template()
 
                 prefixable_types = [t.strip() for t in prefixable_types.split(",")]
-                portal_types = api.get_tool("portal_types")
                 prefixable_types = filter(lambda ct: ct in portal_types,
                                           prefixable_types)
 
@@ -99,6 +106,7 @@ def __call__(self):
                 "ac_name": username,
                 "ac_password": password,
                 "content_types": content_types,
+                "unwanted_content_types": unwanted_content_types,
                 "import_settings": import_settings,
                 "import_users": import_users,
                 "import_registry": import_registry,

src/senaite/sync/browser/templates/add.pt

@@ -162,7 +162,7 @@
                         Content Types
                         <span i18n:translate=""
                               class="help formHelp">
-                          If filled, only indicated Content Types (separated by comma) will be imported. E.g: 'Sample, Client, Worksheet'
+                          If filled, ONLY indicated Content Types (separated by comma) will be imported. E.g: 'Sample, Client, Worksheet'
                         </span>
                       </label>
                       <div class="form-group input-group">
@@ -175,6 +175,28 @@
                     </div>
                   </li>
 
+                  <li class="list-group-item">
+                    <!-- Unwanted Content Types -->
+                    <div class="field form-group field">
+                      <label i18n:translate=""
+                             class="form-control-label"
+                             for="unwanted_content_types">
+                        Content Types to be Skipped
+                        <span i18n:translate=""
+                              class="help formHelp">
+                          If filled, introduced content types will be SKIPPED and only regular objects that are dependencies of the Allowed Types will be imported.. E.g: 'Supplier, Instrument'
+                        </span>
+                      </label>
+                      <div class="form-group input-group">
+                        <input type="text"
+                               size="45"
+                               class="form-control"
+                               id="unwanted_content_types"
+                               name="unwanted_content_types"/>
+                      </div>
+                    </div>
+                  </li>
+
                   <li class="list-group-item">
                     <!-- Prefix -->
                     <div class="field form-group field">
@@ -206,7 +228,7 @@
                         Prefixable Content Types
                         <span i18n:translate=""
                               class="help formHelp">
-                          Please specify exactly which content types must contain Remote's Prefix in their ID's. E.g: 'Sample, Client, Worksheet'
+                          Please specify exactly which content types must contain Remote's Prefix in their ID's. Must be filled if prefix is enabled. E.g: 'Sample, Client, Worksheet'
                         </span>
                       </label>
                       <div class="form-group input-group">

src/senaite/sync/browser/views.py

@@ -66,6 +66,7 @@ def __call__(self):
             username = storage["credentials"]["username"]
             password = storage["credentials"]["password"]
             content_types = storage["configuration"].get("content_types", None)
+            unwanted_content_types = storage["configuration"].get("unwanted_content_types", None)
             prefix = storage["configuration"].get("prefix", None)
             prefixable_types = storage["configuration"].get("prefixable_types", None)
             data = {
@@ -74,6 +75,7 @@ def __call__(self):
                 "ac_name": username,
                 "ac_password": password,
                 "content_types": content_types,
+                "unwanted_content_types": unwanted_content_types,
                 "prefix": prefix,
                 "prefixable_types": prefixable_types,
             }
@@ -105,6 +107,7 @@ def __call__(self):
             username = storage["credentials"]["username"]
             password = storage["credentials"]["password"]
             content_types = storage["configuration"].get("content_types", None)
+            unwanted_content_types = storage["configuration"].get("unwanted_content_types", None)
             prefix = storage["configuration"].get("prefix", None)
             prefixable_types = storage["configuration"].get("prefixable_types", None)
             data = {
@@ -114,6 +117,7 @@ def __call__(self):
                 "ac_password": password,
                 "fetch_time": fetch_time,
                 "content_types": content_types,
+                "unwanted_content_types": unwanted_content_types,
                 "prefix": prefix,
                 "prefixable_types": prefixable_types,
             }

src/senaite/sync/fetchstep.py

@@ -64,6 +64,7 @@ def verify(self):
         storage["credentials"]["password"] = self.password
         # remember import configuration in the storage
         storage["configuration"]["content_types"] = self.content_types
+        storage["configuration"]["unwanted_content_types"] = self.unwanted_content_types
         storage["configuration"]["prefix"] = self.prefix
         storage["configuration"]["prefixable_types"] = self.prefixable_types
         storage["configuration"]["import_settings"] = self.import_settings
@@ -125,7 +126,10 @@ def _fetch_data(self, window=1000, overlap=10):
                     start_from, start_from+window))
             for item in items:
                 # skip object or extract the required data for the import
-                if not item or not item.get("portal_type", True):
+                if not item:
+                    continue
+                portal_type = item.get("portal_type", None)
+                if not portal_type or portal_type in self.unwanted_content_types:
                     continue
                 data_dict = utils.get_soup_format(item)
                 rec_id = self.sh.insert(data_dict)

src/senaite/sync/syncstep.py

@@ -44,6 +44,7 @@ def __init__(self, data):
         self.password = data.get("ac_password", None)
         # Import configuration
         self.content_types = data.get("content_types", None)
+        self.unwanted_content_types = data.get("unwanted_content_types", None)
         self.prefix = data.get("prefix", None)
         self.prefixable_types = data.get("prefixable_types", None)
         self.import_settings = data.get("import_settings", False)