Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

controllers/class.AddDocument.php

@@ -93,6 +93,9 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 							$this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute);
 							return false;
 						}
+					} elseif($attrdef->getMinValues() > 0) {
+						$this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName()));
+						return false;
 					}
 					} else {
 						if($ret === false)

controllers/class.AddSubFolder.php

@@ -45,6 +45,11 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common {
 			if($attrdef = $dms->getAttributeDefinition($attrdefid)) {
 				if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) {
 				if($attribute) {
+					switch($attrdef->getType()) {
+					case SeedDMS_Core_AttributeDefinition::type_date:
+						$attribute = date('Y-m-d', makeTsFromDate($attribute));
+						break;
+					}
 					if(!$attrdef->validate($attribute, null, true)) {
 						$this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute);
 						return false;

controllers/class.EditFolder.php

@@ -70,6 +70,7 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common {
 						}
 					} elseif($attrdef->getMinValues() > 0) {
 						$this->errormsg = getMLText("attr_min_values", array("attrname"=>$attrdef->getName()));
+							return false;
 					} elseif(isset($oldattributes[$attrdefid])) {
 						if(!$folder->removeAttribute($dms->getAttributeDefinition($attrdefid)))
 							return false;

languages/ar_EG/lang.inc

@@ -365,6 +365,7 @@ URL: [url]',
 'discspace' => 'مساحة القرص',
 'docs_in_reception_no_access' => 'الدخول مرفوض الى المستندات في الإستقبال',
 'docs_in_revision_no_access' => 'الدخول مرفوض الى المستندات قيد المراجعة',
+'docs_with_missing_revision_date' => '',
 'document' => 'مستند',
 'documentcontent' => 'موضوع المستند',
 'documents' => 'مستندات',

languages/bg_BG/lang.inc

@@ -348,6 +348,7 @@ $text = array(
 'discspace' => '',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
+'docs_with_missing_revision_date' => '',
 'document' => 'Документ',
 'documentcontent' => '',
 'documents' => 'Документи',

languages/ca_ES/lang.inc

@@ -353,6 +353,7 @@ URL: [url]',
 'discspace' => '',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
+'docs_with_missing_revision_date' => '',
 'document' => 'Document',
 'documentcontent' => '',
 'documents' => 'Documents',

languages/cs_CZ/lang.inc

@@ -377,6 +377,7 @@ URL: [url]',
 'discspace' => 'Místo na disku',
 'docs_in_reception_no_access' => 'Dokumenty s přijetím, ale bez přístupu příjemce',
 'docs_in_revision_no_access' => 'Dokumenty v revizi bez přístupu kontrolora',
+'docs_with_missing_revision_date' => '',
 'document' => 'Dokument',
 'documentcontent' => 'Obsah dokumentu',
 'documents' => 'Dokumenty',

languages/de_DE/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (3129), dgrutsch (22)
+//    Translators: Admin (3130), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -416,6 +416,7 @@ URL: [url]</p>',
 'discspace' => 'Plattenplatz',
 'docs_in_reception_no_access' => 'Dokumente mit Empfangsbestätigung ohne Zugriff des Empfängers',
 'docs_in_revision_no_access' => 'Dokumente in Revision ohne Zugriff des Prüfers',
+'docs_with_missing_revision_date' => 'Dokumente ohne Datum der Wiederholungsprüfung',
 'document' => 'Dokument',
 'documentcontent' => 'Dokumentenversion',
 'documents' => 'Dokumente',

languages/el_GR/lang.inc

@@ -348,6 +348,7 @@ $text = array(
 'discspace' => '',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
+'docs_with_missing_revision_date' => '',
 'document' => 'Έγγραφο',
 'documentcontent' => '',
 'documents' => 'Έγγραφα',

languages/en_GB/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2222), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2223), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -416,6 +416,7 @@ URL: [url]</p>',
 'discspace' => 'Disc space',
 'docs_in_reception_no_access' => 'Documents with reception without access by recipient',
 'docs_in_revision_no_access' => 'Documents in revision without access by revisor',
+'docs_with_missing_revision_date' => 'Documents withoug date of revision',
 'document' => 'Document',
 'documentcontent' => 'Document content',
 'documents' => 'Documents',

languages/es_ES/lang.inc

@@ -372,6 +372,7 @@ URL: [url]',
 'discspace' => 'Espacio en disco',
 'docs_in_reception_no_access' => 'Documentos recibidos sin acceso por recipiente',
 'docs_in_revision_no_access' => 'Documentos en revisión sin acceso para el revisor',
+'docs_with_missing_revision_date' => '',
 'document' => 'Documento',
 'documentcontent' => 'Contenido del documento',
 'documents' => 'Documentos',

languages/fr_FR/lang.inc

@@ -406,6 +406,7 @@ URL : [url]</p>',
 'discspace' => 'Espace disque',
 'docs_in_reception_no_access' => 'Documents en attente de réception sans accès du destinataire',
 'docs_in_revision_no_access' => 'Documents en révision sans accès du réviseur',
+'docs_with_missing_revision_date' => '',
 'document' => 'Document',
 'documentcontent' => 'Version de document',
 'documents' => 'Documents',

languages/hr_HR/lang.inc

@@ -377,6 +377,7 @@ Internet poveznica: [url]',
 'discspace' => 'Prostor na disku',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
+'docs_with_missing_revision_date' => '',
 'document' => 'Dokument',
 'documentcontent' => '',
 'documents' => 'Dokumenti',

languages/hu_HU/lang.inc

@@ -372,6 +372,7 @@ URL: [url]',
 'discspace' => 'Lemezterület',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
+'docs_with_missing_revision_date' => '',
 'document' => 'Dokumentum',
 'documentcontent' => '',
 'documents' => 'Dokumentumok',

languages/id_ID/lang.inc

@@ -386,6 +386,7 @@ URL: [url]</p>',
 'discspace' => 'Ruang penyimpanan',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => 'Dokumen dalam revisi tanpa akses oleh revisor',
+'docs_with_missing_revision_date' => '',
 'document' => 'Dokumen',
 'documentcontent' => 'Isi dokumen',
 'documents' => 'Dokumen',

languages/it_IT/lang.inc

@@ -377,6 +377,7 @@ URL: [url]',
 'discspace' => 'Spazio su disco',
 'docs_in_reception_no_access' => 'Documenti con ricezione senza accesso dai destinatari',
 'docs_in_revision_no_access' => 'Documenti in riesame senza accesso dai revisori',
+'docs_with_missing_revision_date' => '',
 'document' => 'Documento',
 'documentcontent' => 'Contenuto documento',
 'documents' => 'Documenti',

languages/ko_KR/lang.inc

@@ -380,6 +380,7 @@ URL: [url]',
 'discspace' => '디스크 공간',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
+'docs_with_missing_revision_date' => '',
 'document' => '문서',
 'documentcontent' => '',
 'documents' => '문서',

languages/lo_LA/lang.inc

@@ -375,6 +375,7 @@ URL: [url]',
 'discspace' => 'ຟື້ນທີ່ວ່າງໃນດິສ',
 'docs_in_reception_no_access' => 'ເອກະສານທີ່ໄດ້ຮັບແມ່ນບໍ່ສາມາດເຂົ້າເບີ່ງໄດ້',
 'docs_in_revision_no_access' => 'ເອກະສານທີ້ແກ້ໄຂໂດຍບໍ່ຕ້ອງເຂົ້າໄຊ້ງານ',
+'docs_with_missing_revision_date' => '',
 'document' => 'ຟື້ນທີ່ວ່າງໃນດິສ',
 'documentcontent' => 'ເນື້ອຫາເອກະສານ',
 'documents' => 'ເອກະສານ',

languages/nb_NO/lang.inc

@@ -377,6 +377,7 @@ URL: [url]',
 'discspace' => 'Diskplass',
 'docs_in_reception_no_access' => 'Dokumenter med mottak uten tilgang fra mottaker',
 'docs_in_revision_no_access' => 'Dokumenter i revisjon uten tilgang fra korrekturleser',
+'docs_with_missing_revision_date' => '',
 'document' => 'Dokument',
 'documentcontent' => 'Dokumentinnehold',
 'documents' => 'Dokumenter',

languages/nl_NL/lang.inc

@@ -370,6 +370,7 @@ URL: [url]',
 'discspace' => 'Schijfruimte',
 'docs_in_reception_no_access' => 'Documenten zonder toegang ontvanger',
 'docs_in_revision_no_access' => 'Documenten in revisie zonder toegang ontvanger',
+'docs_with_missing_revision_date' => '',
 'document' => 'Document',
 'documentcontent' => 'Documentinhoud',
 'documents' => 'Documenten',

languages/pl_PL/lang.inc

@@ -365,6 +365,7 @@ URL: [url]',
 'discspace' => 'Zajęta przestrzeń dyskowa',
 'docs_in_reception_no_access' => 'Dokumenty z odbiorem bez dostępu odbiorcy',
 'docs_in_revision_no_access' => 'Dokumenty w wersji bez dostępu przez audytora',
+'docs_with_missing_revision_date' => '',
 'document' => 'Dokument',
 'documentcontent' => 'Zawartość dokumentu',
 'documents' => 'Bieżące dokumenty',

languages/pt_BR/lang.inc

@@ -377,6 +377,7 @@ URL: [url]',
 'discspace' => 'Espaço em Disco',
 'docs_in_reception_no_access' => 'Documentos com recepção sem acesso pelo destinatário',
 'docs_in_revision_no_access' => 'Documentos em revisão sem acesso por revisor',
+'docs_with_missing_revision_date' => '',
 'document' => 'Documento',
 'documentcontent' => 'Conteúdo do Documento',
 'documents' => 'Documentos',

languages/ro_RO/lang.inc

@@ -377,6 +377,7 @@ URL: [url]',
 'discspace' => 'Spațiu pe disc',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
+'docs_with_missing_revision_date' => '',
 'document' => 'Document',
 'documentcontent' => 'Continut Document',
 'documents' => 'Documente',

languages/ru_RU/lang.inc

@@ -377,6 +377,7 @@ URL: [url]',
 'discspace' => 'Дисковое пространство',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
+'docs_with_missing_revision_date' => '',
 'document' => 'Документ',
 'documentcontent' => 'Содержание документа',
 'documents' => 'док.',

languages/sk_SK/lang.inc

@@ -377,6 +377,7 @@ URL: [url]',
 'discspace' => 'Priestor na disku',
 'docs_in_reception_no_access' => 'Documents with reception without access by recipient',
 'docs_in_revision_no_access' => 'Documents in revision without access by revisor',
+'docs_with_missing_revision_date' => '',
 'document' => 'Dokument',
 'documentcontent' => 'Obsah dokumentu',
 'documents' => 'Dokumenty',

languages/sv_SE/lang.inc

@@ -378,6 +378,7 @@ URL: [url]',
 'discspace' => 'Diskutrymme',
 'docs_in_reception_no_access' => 'Dokument med angiven mottagare som saknar behörighet till dokumentet',
 'docs_in_revision_no_access' => 'Dokument med angiven granskare som saknar behörighet till dokumentet',
+'docs_with_missing_revision_date' => '',
 'document' => 'Dokument',
 'documentcontent' => 'Dokumentinnehåll',
 'documents' => 'Dokument',

languages/tr_TR/lang.inc

@@ -371,6 +371,7 @@ URL: [url]',
 'discspace' => 'Disk alanı',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
+'docs_with_missing_revision_date' => '',
 'document' => 'Doküman',
 'documentcontent' => 'Döküman İçeriği',
 'documents' => 'Dokümanlar',

languages/uk_UA/lang.inc

@@ -377,6 +377,7 @@ URL: [url]',
 'discspace' => 'Дисковий простір',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
+'docs_with_missing_revision_date' => '',
 'document' => 'Документ',
 'documentcontent' => '',
 'documents' => 'док.',

languages/zh_CN/lang.inc

@@ -371,6 +371,7 @@ URL: [url]',
 'discspace' => '磁盘空间',
 'docs_in_reception_no_access' => '收件人未访问接收到的文档',
 'docs_in_revision_no_access' => '修订人未访问带修订文档',
+'docs_with_missing_revision_date' => '',
 'document' => '文档',
 'documentcontent' => '文档内容',
 'documents' => '文档',

languages/zh_TW/lang.inc

@@ -377,6 +377,7 @@ URL: [url]',
 'discspace' => '磁碟空間',
 'docs_in_reception_no_access' => '帶有收件人的文件，收件人無法訪問',
 'docs_in_revision_no_access' => '修訂中的文件，沒有修訂者可以訪問',
+'docs_with_missing_revision_date' => '',
 'document' => '文件',
 'documentcontent' => '文件內容',
 'documents' => '文件',

views/bootstrap/class.AttributeMgr.php

@@ -100,7 +100,12 @@ $(document).ready( function() {
 							$value = $selattrdef->parseValue($entry['value']);
 							$content .= "<tr>";
 							$content .= "<td>".htmlspecialchars(implode('<span style="color: #aaa;">'.($separator ? ' '.$separator.' ' : ' ; ').'</span>', $value))."</td>";
-							$content .= "<td><a href=\"../out/out.Search.php?resultmode=".($type == 'folder' ? 2 : ($type == 'document' ? 1 : 3))."&attributes[".$selattrdef->getID()."]=".urlencode($entry['value'])."\">".urlencode($entry['c'])."</a></td>";
+							$content .= "<td><a href=\"../out/out.Search.php?fullsearch=0&resultmode=".($type == 'folder' ? 2 : ($type == 'document' ? 1 : 3))."&";
+							if($selattrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date)
+								$content .= "attributes[".$selattrdef->getID()."][from]=".urlencode($entry['value'])."&attributes[".$selattrdef->getID()."][to]=".urlencode($entry['value']);
+							else
+								$content .= "attributes[".$selattrdef->getID()."]=".urlencode($entry['value']);
+							$content .= "\">".urlencode($entry['c'])."</a></td>";
 							$content .= "<td>";
 							/* various checks, if the value is valid */
 							if(!$selattrdef->validate($entry['value'])) {