You can now choose if you want to validate your content

boboldehampsink · Jun 1, 2015 · 724e15e · 724e15e
1 parent 77a0da0
commit 724e15e
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 7 deletions.
diff --git a/services/Import_CategoryService.php b/services/Import_CategoryService.php
@@ -124,8 +124,11 @@ public function prepForElementModel(array &$fields, BaseElementModel $element)
      */
     public function save(BaseElementModel &$element, $settings)
     {
-        // Save category
-        return craft()->categories->saveCategory($element);
+        if ($settings->validate) {
+            return craft()->categories->saveCategory($element);
+        } else {
+            return craft()->elements->saveElement($element, false);
+        }
     }
 
     /**

diff --git a/services/Import_EntryService.php b/services/Import_EntryService.php
@@ -233,8 +233,15 @@ public function prepForElementModel(array &$fields, BaseElementModel $element)
      */
     public function save(BaseElementModel &$element, $settings)
     {
-        // Save user
-        if (craft()->entries->saveEntry($element)) {
+        // Save element
+        if ($settings->validate) {
+            $result = craft()->entries->saveEntry($element);
+        } else {
+            $result = craft()->elements->saveElement($element, false);
+        }
+
+        // Save version
+        if ($result) {
 
             // If entry revisions are supported
             if (craft()->getEdition() == Craft::Pro) {

diff --git a/services/Import_UserService.php b/services/Import_UserService.php
@@ -189,8 +189,15 @@ public function prepForElementModel(array &$fields, BaseElementModel $element)
      */
     public function save(BaseElementModel &$element, $settings)
     {
-        // Save user
-        if (craft()->users->saveUser($element)) {
+        // Save element
+        if ($settings->validate) {
+            $result = craft()->users->saveUser($element);
+        } else {
+            $result = craft()->elements->saveElement($element, false);
+        }
+
+        // Save usergroup
+        if ($result) {
 
             // Assign to groups
             craft()->userGroups->assignUserToGroups($element->id, $settings['elementvars']['groups']);

diff --git a/tasks/ImportTask.php b/tasks/ImportTask.php
@@ -37,7 +37,8 @@ protected function defineSettings()
             'type'        => AttributeType::String,
             'elementvars' => array(AttributeType::Mixed, 'default' => array()),
             'behavior'    => array(AttributeType::Name, 'default' => ImportModel::BehaviorAppend),
-            'email'       => AttributeType::Email,
+            'validate'    => array(AttributeType::Bool, 'default' => true),
+            'email'       => array(AttributeType::Bool, 'default' => false),
             'backup'      => array(AttributeType::Bool, 'default' => false),
             'history'     => AttributeType::Number,
         );

diff --git a/templates/index.twig b/templates/index.twig
@@ -101,6 +101,26 @@
                         </div>
                     </td>
                 </tr>
+                <tr class="importValidate">
+                    <td>
+                        <div class="field">
+                            <div class="heading">
+                                <label>{{ "Validate content"|t }}</label>
+                                <div class="instructions">
+                                    <p>{{ "Enable field validation when importing."|t }}</p>
+                                </div>
+                            </div>
+                        </div>
+                    </td>
+                    <td>
+                        <div class="field">
+                            <div class="input">
+                                <input type="hidden" name="import[validate]" value="0">
+                                <input type="checkbox" name="import[validate]" value="1" id="validate" checked />
+                            </div>
+                        </div>
+                    </td>
+                </tr>
                 <tr class="importEmail">
                     <td>
                         <div class="field">