- files should be validated when required

- if there's no metadata, don't bother asking for it. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5828 c91229c3-7414-0410-bfa2-8a42b809f60b

- files should be validated when required
- if there's no metadata, don't bother asking for it. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5828 c91229c3-7414-0410-bfa2-8a42b809f60b
bshuttle
1 parent ad015526
Showing 4 changed files with 51 additions and 4 deletions
plugins/ktcore/KTCorePlugin.php
plugins/ktcore/KTValidators.php
plugins/ktcore/KTWidgets.php
plugins/ktcore/folder/addDocument.php
@@ -141,6 +141,7 @@ class KTCorePlugin extends KTPlugin {
         $this->registerValidator('KTMembershipValidator', 'ktcore.validators.membership', 'KTValidators.php');                
         $this->registerValidator('KTFieldsetValidator', 'ktcore.validators.fieldset', 'KTValidators.php');                
         $this->registerValidator('KTFileValidator', 'ktcore.validators.file', 'KTValidators.php');                        
+        $this->registerValidator('KTRequiredFileValidator', 'ktcore.validators.requiredfile', 'KTValidators.php');                   
  
         // criterion
         $this->registerCriterion('NameCriterion', 'ktcore.criteria.name', KT_LIB_DIR . '/browse/Criteria.inc');
@@ -147,6 +147,26 @@ class KTRequiredValidator extends KTValidator {
     }
 }
  
+// the required validator checks either single or multiple items
+// in the data array.
+class KTRequiredFileValidator extends KTValidator {
+    var $sNamespace = 'ktcore.validators.requiredfile';
+    
+    function validate($data) {
+        $errors = array();
+        
+        $val = KTUtil::arrayGet($_FILES, $this->sInputVariable);
+        if (empty($val) || empty($val['name'])) {
+            $errors[$this->sBasename] = _kt("You must select a file to upload.");
+        } 
+        
+        return array(
+            'errors' => $errors,
+            'results' => array(),
+        );
+    }
+}
+
 class KTEmailValidator extends KTValidator {
     var $sNamespace = 'ktcore.validators.emailaddress';
  
@@ -22,6 +22,18 @@ class KTCoreFileWidget extends KTWidget {
         $tname = sprintf("_kt_attempt_unique_%s", $this->sName);
         return array($this->sBasename => $_FILES[$tname]);
     }
+    
+    function getValidators() {
+        if (!$this->bAutoValidate) {
+            return null;
+        }
+        
+        $oVF =& KTValidatorFactory::getSingleton();        
+        return $oVF->get('ktcore.validators.requiredfile', array(
+            'test' => sprintf("_kt_attempt_unique_%s", $this->sName),
+            'basename' => $this->sBasename,
+        ));
+    }
 }
  
  
@@ -105,6 +105,7 @@ class KTFolderAddDocumentAction extends KTFolderAction {
                 'initial_string' => _kt('- Please select a document type -'),
                 'id_method' => 'getId',
                 'label_method' => 'getName',
+                'simple_select' => false,
             )),                        
         ));
  
@@ -127,6 +128,15 @@ class KTFolderAddDocumentAction extends KTFolderAction {
  
         return $oForm;
     }
+    
+    function getFieldsetsForType($iTypeId) {
+        $typeid = KTUtil::getId($iTypeId);
+        $aGenericFieldsetIds = KTFieldset::getGenericFieldsets(array('ids' => false));
+        $aSpecificFieldsetIds = KTFieldset::getForDocumentType($typeid, array('ids' => false));
+        
+        $fieldsets = kt_array_merge($aGenericFieldsetIds, $aSpecificFieldsetIds);
+        return $fieldsets;        
+    }
  
     function do_main() {
         $this->oPage->setBreadcrumbDetails(_kt("Add a document"));
@@ -147,6 +157,13 @@ class KTFolderAddDocumentAction extends KTFolderAction {
         $data = $res['results'];
         $key = KTUtil::randomString(32);
         $_SESSION['_add_data'] = array($key => $data);
+        
+        // if we don't need metadata
+        $fieldsets = $this->getFieldsetsForType($data['document_type']);
+        if (empty($fieldsets)) {
+            return $this->successRedirectTo('finalise', _kt("File uploaded successfully. Processing."), sprintf("fFileKey=%s", $key));        
+        }
+        
         // if we need metadata
  
         $this->successRedirectTo('metadata', _kt("File uploaded successfully.  Please fill in the metadata below."), sprintf("fFileKey=%s", $key));
@@ -171,10 +188,7 @@ class KTFolderAddDocumentAction extends KTFolderAction {
  
         $widgets = array();
         $validators = array();
-        $aGenericFieldsetIds = KTFieldset::getGenericFieldsets(array('ids' => false));
-        $aSpecificFieldsetIds = KTFieldset::getForDocumentType($doctypeid, array('ids' => false));
-        
-        $fieldsets = kt_array_merge($aGenericFieldsetIds, $aSpecificFieldsetIds);
+        $fieldsets = $this->getFieldsetsForType($doctypeid);
  
         foreach ($fieldsets as $oFieldset) {
             $widgets = kt_array_merge($widgets, $oFReg->widgetsForFieldset($oFieldset, 'fieldset_' . $oFieldset->getId(), $this->oDocument));