Peter M. Groen / knowledgetree

Commit ed90b96fdf4ea30e0f6b804f05394d7ee47b538f

Authored by kevin_fourie
1 parent f7ca3da6

Merged the following from STABLE trunk to 3.3.3 Release Branch... 

KTS-1707
"When help is requested, alert display "view document" instead of "View help request""
Changed text. Thanks Guillaume Dufloux!

Reviewed By: Conrad

KTS-1557
"Inter-Document Linking links only the last document in the selection widget. "
Verified.

Reviewed By: Kevin


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.3.3-Release-Branch@6346 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 4 additions and 1 deletions
resources/js/collectionframe.js
  View file @ed90b96
@@ -43,6 +43,9 @@ function setupFrame(frame) { @@ -43,6 +43,9 @@ function setupFrame(frame) {
43 continue; 43 continue;
44 } 44 }
45 forEach(elms, function(v) { 45 forEach(elms, function(v) {
  46 +
  47 + if(v.type=='radio') { if (!v.checked){ return; }}
  48 +
46 var newInput = INPUT({'type':'hidden', 49 var newInput = INPUT({'type':'hidden',
47 'name':v.name, 50 'name':v.name,
48 'value':v.value}); 51 'value':v.value});
templates/ktcore/assist/assist_notification.smarty
  View file @ed90b96
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 the owner or an admin of this document.{/i18n} 5 the owner or an admin of this document.{/i18n}
6 <div class="actionoptions"> 6 <div class="actionoptions">
7 {if !$is_broken} 7 {if !$is_broken}
8 - <a href="{ktLink base="notify.php" query="id=`$notify_id`"}">{i18n}View Document{/i18n}</a> 8 + <a href="{ktLink base="notify.php" query="id=`$notify_id`"}">{i18n}View Help Request{/i18n}</a>
9 {else} 9 {else}
10 <span class="descriptiveText">{i18n}Document is no longer available{/i18n}</span> 10 <span class="descriptiveText">{i18n}Document is no longer available{/i18n}</span>
11 {/if} 11 {/if}