Peter M. Groen / knowledgetree

Commit c28106aca0711530e64955573d7dbd5dc506ae88

Authored by kevin_fourie
1 parent f32f0724

Merged in from DEV trunk... 

KTS-2439
"Use of wrong field in update of workflow state replacement during workflow state deletion"
Fixed. Static call to cache clearing function that is not static was causing fatal error.

Committed By: Conrad Vermeulen
Reviewed By: Megan Watson

KTS-3098
"If the Field contain more than 50 character you cannot scroll to the right"
Fixed. Truncated the filed to 40 characters.

Committed by: Megan Watson
Reviewed by: Conrad Vermeulen



git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8197 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 4 additions and 5 deletions
lib/workflow/workflowutil.inc.php
  View file @c28106a
@@ -837,7 +837,6 @@ class KTWorkflowUtil { @@ -837,7 +837,6 @@ class KTWorkflowUtil {
837 if (PEAR::isError($res)) { return $res; } 837 if (PEAR::isError($res)) { return $res; }
838 838
839 Document::clearAllCaches(); 839 Document::clearAllCaches();
840 - KTWorkflowTransition::clearCachedGroups();  
841 } 840 }
842 } 841 }
843 842
templates/ktcore/metadata/admin/list.smarty
  View file @c28106a
@@ -41,13 +41,13 @@ @@ -41,13 +41,13 @@
41 {else} 41 {else}
42 <span class="ktAction ktDenied">{i18n}No{/i18n}</span> 42 <span class="ktAction ktDenied">{i18n}No{/i18n}</span>
43 {/if} 43 {/if}
44 - </td> 44 + </td>
45 <td> 45 <td>
46 {assign var="aFields" value=$oFieldset->getFields()} 46 {assign var="aFields" value=$oFieldset->getFields()}
47 {if $aFields} 47 {if $aFields}
48 48
49 {foreach from=$aFields item=oField name=fields} 49 {foreach from=$aFields item=oField name=fields}
50 -{$oField->getName()}{if (!$smarty.foreach.fields.last)}<br/> {/if} 50 +{$oField->getName()|truncate:40}{if (!$smarty.foreach.fields.last)}<br/> {/if}
51 {/foreach} 51 {/foreach}
52 52
53 {else} 53 {else}
@@ -65,9 +65,9 @@ @@ -65,9 +65,9 @@
65 <td> 65 <td>
66 <a href="{addQS}action=delete&fFieldsetId={$oFieldset->getId()}{/addQS}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a> 66 <a href="{addQS}action=delete&fFieldsetId={$oFieldset->getId()}{/addQS}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a>
67 </td> 67 </td>
68 -  
69 68
70 - 69 +
  70 +
71 </tr> 71 </tr>
72 </tbody> 72 </tbody>
73 {/foreach} 73 {/foreach}