gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 13:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

another switch for taking the comment for the version

Browse Source 
if there is no version comment then the document comment can be taken
if the users forces it.
This commit is contained in:
Uwe Steinmann 2013-06-06 14:05:03 +02:00
parent ac8dfd477a
commit d344eaea9a
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
languages/de_DE/lang.inc
View File

@ -846,6 +846,7 @@ $text = array(
'uploaded_by' => "Hochgeladen durch", 'uploaded_by' => "Hochgeladen durch",
'uploading_failed' => "Das Hochladen einer Datei ist fehlgeschlagen. Bitte überprüfen Sie die maximale Dateigröße für Uploads.", 'uploading_failed' => "Das Hochladen einer Datei ist fehlgeschlagen. Bitte überprüfen Sie die maximale Dateigröße für Uploads.",
'uploading_zerosize' => "Versuch eine leere Datei hochzuladen. Vorgang wird abgebrochen.", 'uploading_zerosize' => "Versuch eine leere Datei hochzuladen. Vorgang wird abgebrochen.",
'use_comment_of_document' => "Verwende Kommentar des Dokuments",
'use_default_categories' => "Kategorievorlagen", 'use_default_categories' => "Kategorievorlagen",
'use_default_keywords' => "Stichwortvorlagen", 'use_default_keywords' => "Stichwortvorlagen",
'used_discspace' => "Verbrauchter Speicherplatz", 'used_discspace' => "Verbrauchter Speicherplatz",

1
languages/en_GB/lang.inc
View File

@ -848,6 +848,7 @@ $text = array(
'uploaded_by' => "Uploaded by", 'uploaded_by' => "Uploaded by",
'uploading_failed' => "Uploading one of your files failed. Please check your maximum upload file size.", 'uploading_failed' => "Uploading one of your files failed. Please check your maximum upload file size.",
'uploading_zerosize' => "Uploading an empty file. Upload is canceled.", 'uploading_zerosize' => "Uploading an empty file. Upload is canceled.",
'use_comment_of_document' => "Use comment of document",
'use_default_categories' => "Use predefined categories", 'use_default_categories' => "Use predefined categories",
'use_default_keywords' => "Use predefined keywords", 'use_default_keywords' => "Use predefined keywords",
'used_discspace' => "Used disk space", 'used_discspace' => "Used disk space",

2
op/op.AddDocument.php
View File

@ -51,6 +51,8 @@ if ($folder->getAccessMode($user) < M_READWRITE) {
$comment = $_POST["comment"]; $comment = $_POST["comment"];
$version_comment = $_POST["version_comment"]; $version_comment = $_POST["version_comment"];
if($version_comment == "" && isset($_POST["use_comment"]))
$version_comment = $comment;
$keywords = $_POST["keywords"]; $keywords = $_POST["keywords"];
$categories = isset($_POST["categories"]) ? $_POST["categories"] : null; $categories = isset($_POST["categories"]) ? $_POST["categories"] : null;

5
views/bootstrap/class.AddDocument.php
View File

@ -162,7 +162,7 @@ function addFiles()
<span class="add-on"><i class="icon-calendar"></i></span> <span class="add-on"><i class="icon-calendar"></i></span>
</span>&nbsp; </span>&nbsp;
<label class="checkbox inline"> <label class="checkbox inline">
<input type="checkbox" name="expires" value="false" checked><?php printMLText("does_not_expire");?><br> <input type="checkbox" name="expires" value="false" checked><?php printMLText("does_not_expire");?>
</label> </label>
</td> </td>
</tr> </tr>
@ -193,7 +193,8 @@ function addFiles()
<?php } ?> <?php } ?>
<tr> <tr>
<td><?php printMLText("comment_for_current_version");?>:</td> <td><?php printMLText("comment_for_current_version");?>:</td>
<td><textarea name="version_comment" rows="3" cols="80"></textarea></td> <td><textarea name="version_comment" rows="3" cols="80"></textarea><br />
<label class="checkbox inline"><input type="checkbox" name="use_comment" value="1" /> <?php printMLText("use_comment_of_document"); ?></label></td>
</tr> </tr>
<?php <?php
$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all)); $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));