Peter M. Groen / knowledgetree

Commit e8fdad99606151a575f4ed85316af92380d7a0cc

Authored by kevin_fourie
1 parent 1c0939f5

Merged the following issues in from STABLE trunk... 

KTC-4
"Setup Script for Email Fieldset for Outlook usage"
Done. A core plugin change was needed for this.

Reviewed By: Kevin

KTS-1751
"[error] File does not exist: /var/www/html/thirdpartyjs/MochiKit/Base.js, referer: http://host/browse.php in error log"
Fixed.

Reviewed By: Jalaloedien
 

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.3.3-Release-Branch@6352 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 9 additions and 4 deletions
plugins/ktcore/KTCorePlugin.php
  View file @e8fdad9
... ... @@ -230,7 +230,14 @@ class KTCorePlugin extends KTPlugin {
230 230 $this->registerAdminPage('fieldmanagement2', 'KTDocumentFieldDispatcher', 'documents',
231 231 _kt('Document Fieldsets'),
232 232 _kt('Manage the different types of information that can be associated with classes of documents.'),
233   - 'admin/documentFieldsv2.php', null);
  233 + 'admin/documentFieldsv2.php', null);
  234 + if(KTPluginUtil::pluginIsActive('ktdms.wintools'))
  235 + {
  236 + $this->registerAdminPage('emailtypemanagement', 'KTEmailDocumentTypeDispatcher', 'documents',
  237 + _kt('Email Document Types'),
  238 + _kt('Manage the addition of Email document types to the system.'),
  239 + '../wintools/email/emailDocumentTypes.php', null);
  240 + }
234 241 $this->registerAdminPage('workflows_2', 'KTWorkflowAdminV2', 'documents',
235 242 _kt('Workflows'), _kt('Configure the process documents go through.'),
236 243 'admin/workflowsv2.php', null);
... ...
templates/kt3/browse.smarty
  View file @e8fdad9
1   -{$context->oPage->requireJSResource('thirdpartyjs/MochiKit/Base.js')}
2   -{$context->oPage->requireJSResource('thirdpartyjs/MochiKit/Iter.js')}
3   -{$context->oPage->requireJSResource('thirdpartyjs/MochiKit/DOM.js')}
  1 +{$context->oPage->requireJSResource('thirdpartyjs/MochiKit/MochiKitPacked.js')}
4 2  
5 3 {$context->oPage->requireJSResource('resources/js/toggleselect.js')}
6 4  
... ...