Peter M. Groen / knowledgetree

Commit 66810dfe7f4d60db231049d41d011aa43fa6cf8c

Authored by kevin_fourie
1 parent c159e792

Merged in from DEV trunk... 

WSA-114
"Uploading a document via hot folders, not specifying the Date Created and Date Modified the server inserts its own random date."
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Megan Watson

WSA-118
"Java proxy objects experiencing exceptions"
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Megan Watson

KTS-3199
"Cannot scroll to the right or left on the workflow configuration page of a large workflow"
Fixed. Wrapped the workflow table a div with scrolling.

Committed By: Jonathan Byrne
Reviewed By: Megan Watson


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8299 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 10 additions and 3 deletions
ktapi/KTAPIDocument.inc.php
  View file @66810df
@@ -1159,10 +1159,10 @@ class KTAPI_Document extends KTAPI_FolderItem @@ -1159,10 +1159,10 @@ class KTAPI_Document extends KTAPI_FolderItem
1159 $indexContent = $value; 1159 $indexContent = $value;
1160 break; 1160 break;
1161 case 'created_date': 1161 case 'created_date':
1162 - $documents['created'] = $value; 1162 + if (!empty($value)) $documents['created'] = $value;
1163 break; 1163 break;
1164 case 'modified_date': 1164 case 'modified_date':
1165 - $documents['modified'] = $value; 1165 + if (!empty($value)) $documents['modified'] = $value;
1166 break; 1166 break;
1167 case 'is_immutable': 1167 case 'is_immutable':
1168 $documents['immutable'] = in_array(strtolower($value), array('1','true','on','yes'))?'1':'0'; 1168 $documents['immutable'] = in_array(strtolower($value), array('1','true','on','yes'))?'1':'0';
@@ -1645,6 +1645,12 @@ class KTAPI_Document extends KTAPI_FolderItem @@ -1645,6 +1645,12 @@ class KTAPI_Document extends KTAPI_FolderItem
1645 // get the storage path 1645 // get the storage path
1646 $detail['storage_path'] = $document->getStoragePath(); 1646 $detail['storage_path'] = $document->getStoragePath();
1647 1647
  1648 + if ($wsversion >= 2)
  1649 + {
  1650 + unset($detail['updated_by']);
  1651 + unset($detail['updated_date']);
  1652 + }
  1653 +
1648 return $detail; 1654 return $detail;
1649 } 1655 }
1650 1656
templates/ktcore/workflow/admin/new_wizard_step2.smarty
  View file @66810df
@@ -9,6 +9,7 @@ states. Use the table below to configure this behaviour.{/i18n}</p> @@ -9,6 +9,7 @@ states. Use the table below to configure this behaviour.{/i18n}</p>
9 <input type="hidden" name="{$k}" value="{$v}" /> 9 <input type="hidden" name="{$k}" value="{$v}" />
10 {/foreach} 10 {/foreach}
11 <input type="hidden" name="fWizardKey" value="{$fWizardKey}" /> 11 <input type="hidden" name="fWizardKey" value="{$fWizardKey}" />
  12 + <div style="overflow:scroll">
12 <table class="kt_collection" cellspacing="0"> 13 <table class="kt_collection" cellspacing="0">
13 <thead> 14 <thead>
14 <tr> 15 <tr>
@@ -35,7 +36,7 @@ states. Use the table below to configure this behaviour.{/i18n}&lt;/p&gt; @@ -35,7 +36,7 @@ states. Use the table below to configure this behaviour.{/i18n}&lt;/p&gt;
35 {/foreach} 36 {/foreach}
36 </tbody> 37 </tbody>
37 </table> 38 </table>
38 - 39 + </div>
39 40
40 <div class="form_actions"> 41 <div class="form_actions">
41 <input type="submit" value="{i18n}Create Workflow{/i18n}" /> 42 <input type="submit" value="{i18n}Create Workflow{/i18n}" />