Peter M. Groen / knowledgetree

Commit 053e0c5c087c989b901f7930bf7ddc4d4d5bfcdb

Authored by kevin_fourie
1 parent df53c42c

Merged in from STABLE trunk... 

KTC-220
"There is no Baobab setting in the config.ini file, when doing a fresh commercial installation of KT server."

Fixed. Added BaobabSettings section.

Committed By: Kevin Fourie
Reviewed By: Isaac Lundall

BBS-1036
"Option to turn off request for metadata on document upload"
Added a function to the web services API to retrieve KTtools configuration from the server.

Committed By: Isaac Lundall
Reviewed By: Martin Kirsten

KTS-2317
"There is a duplicate entry in the knowledgetree.pot file"
Fixed. Removed duplicate entries.

Committed By: Kevin Fourie
Reviewed By: Conrad Vermeulen

KTS-2268
"When selecting "Action Restriction" for a workflow, the actions are not restricted"
Fixed. Removed broken actions check. This will still need to be investigated more but for now it works.

Committed By: Kevin Fourie
Reviewed By: Conrad Vermeulen

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.4.3-Release-Branch@7111 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 8 changed files with 106 additions and 60 deletions
config/config.ini
  View file @053e0c5
... ... @@ -72,7 +72,7 @@ useNewDashboard = default
72 72 [dashboard]
73 73 ; Display the "Your Checked-out Documents" dashlet even when empty.
74 74 ; Defaults to false
75   -alwayShowYCOD = default
  75 +alwaysShowYCOD = default
76 76  
77 77 [storage]
78 78 ; By default uses KTOnDiskHashedStorageManager
... ... @@ -270,6 +270,14 @@ cacheEnabled = true
270 270 cacheDirectory = ${varDirectory}/cache
271 271  
272 272 [KTWebDAVSettings]
  273 +; This section is for KTWebDAV only
  274 +; _LOTS_ of debug info will be logged if the following is "on"
  275 +debug = off
  276 +; To allow write access to WebDAV clients set safe mode to "off" below
  277 +safemode = on
  278 +
  279 +[BaobabSettings]
  280 +; This section is for Baobab only
273 281 ; _LOTS_ of debug info will be logged if the following is "on"
274 282 debug = off
275 283 ; To allow write access to WebDAV clients set safe mode to "off" below
... ... @@ -282,3 +290,9 @@ safemode = on
282 290  
283 291 ; Identify the location of the mysql.exe and mysqldump.exe
284 292 ;mysqlDirectory=c:/program files/ktdms/mysql/bin
  293 +
  294 +[KTtoolsSettings]
  295 +;These two settings control whether or not the client is prompted for metadata when a
  296 +;document is added to knowledgetree via KTtools. They default to true.
  297 +explorerMetadataCapture = true
  298 +officeMetadataCapture = true
... ...
config/dmsDefaults.php
  View file @053e0c5
... ... @@ -450,6 +450,10 @@ class KTInit {
450 450 $oKTConfig->setdefaultns('webservice', 'uploadExpiry', '30');
451 451 $oKTConfig->setdefaultns('webservice', 'downloadExpiry', '30');
452 452 $oKTConfig->setdefaultns('webservice', 'randomKeyText', 'bkdfjhg23yskjdhf2iu');
  453 +
  454 + $oKTConfig->setdefaultns('KTtoolsSettings', 'explorerMetadataCapture', true);
  455 + $oKTConfig->setdefaultns('KTtoolsSettings', 'officeMetadataCapture', true);
  456 +
453 457  
454 458 $res = $this->readConfig();
455 459 if (PEAR::isError($res)) { return $res; }
... ...
docs/VERSION-NAME.txt
  View file @053e0c5
1   -OSS 3.4.2
  1 +OSS 3.4.3
... ...
docs/VERSION-OSS.txt
  View file @053e0c5
1   -3.4.2
  1 +3.4.3
... ...
i18n/knowledgeTree.pot
  View file @053e0c5
... ... @@ -135,6 +135,7 @@ msgstr ""
135 135  
136 136 #: plugins/ktcore/folder/BulkImport.php:63
137 137 #: plugins/ktcore/folder/BulkUpload.php:70
  138 +#: plugins/ktcore/folder/addDocument.php:105
138 139 msgid "- Please select a document type -"
139 140 msgstr ""
140 141  
... ... @@ -150,10 +151,6 @@ msgstr ""
150 151 msgid "(e.g. which transitions lead to which states)"
151 152 msgstr ""
152 153  
153   -#: plugins/ktcore/folder/addDocument.php:105
154   -msgid "- Please select a document type -"
155   -msgstr ""
156   -
157 154 #: plugins/ktcore/admin/groupManagement.php:277
158 155 #: plugins/ktcore/admin/groupManagement.php:420
159 156 #: plugins/ktcore/admin/userManagement.php:367
... ... @@ -4074,6 +4071,8 @@ msgstr ""
4074 4071  
4075 4072 #: i18n/templates.c:1334 i18n/templates.c:4064 i18n/templates.c:4298
4076 4073 #: i18n/templates.c:4316
  4074 +#: i18n/templates.c:3326 i18n/templates.c:4043 i18n/templates.c:4415
  4075 +#: i18n/templates.c:4922
4077 4076 msgid "Group"
4078 4077 msgstr ""
4079 4078  
... ... @@ -4126,15 +4125,12 @@ msgstr ""
4126 4125 msgid "Group's name"
4127 4126 msgstr ""
4128 4127  
4129   -#: i18n/templates.c:3326 i18n/templates.c:4043 i18n/templates.c:4415
4130   -#: i18n/templates.c:4922
4131   -msgid "Group"
4132   -msgstr ""
4133   -
4134 4128 #: plugins/ktcore/admin/groupManagement.php:398
4135 4129 #: plugins/ktcore/admin/userManagement.php:343
4136 4130 #: plugins/ktstandard/KTEmail.php:273 i18n/templates.c:3233
4137 4131 #: i18n/templates.c:3269
  4132 +#: plugins/ktcore/admin/workflowsv2.php:1915 i18n/templates.c:4127
  4133 +#: i18n/templates.c:4586
4138 4134 msgid "Groups"
4139 4135 msgstr ""
4140 4136  
... ... @@ -4154,11 +4150,6 @@ msgstr ""
4154 4150 msgid "Groups without units cannot be Unit Administrators."
4155 4151 msgstr ""
4156 4152  
4157   -#: plugins/ktcore/admin/workflowsv2.php:1915 i18n/templates.c:4127
4158   -#: i18n/templates.c:4586
4159   -msgid "Groups"
4160   -msgstr ""
4161   -
4162 4153 #: plugins/ktcore/admin/workflowsv2.php:1418
4163 4154 #: plugins/ktcore/admin/workflowsv2.php:1640
4164 4155 msgid "Guard"
... ... @@ -6873,6 +6864,8 @@ msgid "Return to where you came from."
6873 6864 msgstr ""
6874 6865  
6875 6866 #: i18n/templates.c:4106 i18n/templates.c:4577
  6867 +#: i18n/templates.c:3323 i18n/templates.c:4034 i18n/templates.c:4406
  6868 +#: i18n/templates.c:4913
6876 6869 msgid "Role"
6877 6870 msgstr ""
6878 6871  
... ... @@ -6916,21 +6909,8 @@ msgstr ""
6916 6909 msgid "Role now uses parent."
6917 6910 msgstr ""
6918 6911  
6919   -#: i18n/templates.c:3320 i18n/templates.c:4031 i18n/templates.c:4403
6920   -#: i18n/templates.c:4910
6921   -msgid "Role or Group"
6922   -msgstr ""
6923   -
6924   -#: i18n/templates.c:3323 i18n/templates.c:4034 i18n/templates.c:4406
6925   -#: i18n/templates.c:4913
6926   -msgid "Role"
6927   -msgstr ""
6928   -
6929 6912 #: plugins/ktcore/KTCorePlugin.php:218 i18n/templates.c:3230
6930 6913 #: i18n/templates.c:3266
6931   -msgid "Roles"
6932   -msgstr ""
6933   -
6934 6914 #: plugins/ktcore/admin/workflowsv2.php:1921
6935 6915 msgid "Roles"
6936 6916 msgstr ""
... ... @@ -7719,9 +7699,6 @@ msgid "The document must match condition \"<strong>%s</strong>\"."
7719 7699 msgstr ""
7720 7700  
7721 7701 #: lib/widgets/fieldsetDisplay.inc.php:335
7722   -msgid "The document title is used as the main name of a document throughout %s™."
7723   -msgstr ""
7724   -
7725 7702 #: plugins/ktcore/document/edit.php:91
7726 7703 #: plugins/ktcore/folder/addDocument.php:95
7727 7704 msgid "The document title is used as the main name of a document throughout %s™."
... ... @@ -8593,9 +8570,6 @@ msgid "Transitions from this state"
8593 8570 msgstr ""
8594 8571  
8595 8572 #: i18n/templates.c:3290
8596   -msgid "Transitions to this state"
8597   -msgstr ""
8598   -
8599 8573 #: i18n/templates.c:3503 i18n/templates.c:3617
8600 8574 msgid "Transitions to this state"
8601 8575 msgstr ""
... ... @@ -9176,6 +9150,8 @@ msgstr ""
9176 9150 #: i18n/templates.c:1385 i18n/templates.c:2966 i18n/templates.c:4352
9177 9151 #: i18n/templates.c:4883 i18n/templates.c:4949 i18n/templates.c:5003
9178 9152 #: i18n/templates.c:5027
  9153 +#: i18n/templates.c:4052 i18n/templates.c:4355 i18n/templates.c:4424
  9154 +#: i18n/templates.c:4886 i18n/templates.c:4931
9179 9155 msgid "User"
9180 9156 msgstr ""
9181 9157  
... ... @@ -9252,11 +9228,6 @@ msgstr ""
9252 9228 msgid "User's name"
9253 9229 msgstr ""
9254 9230  
9255   -#: i18n/templates.c:4052 i18n/templates.c:4355 i18n/templates.c:4424
9256   -#: i18n/templates.c:4886 i18n/templates.c:4931
9257   -msgid "User"
9258   -msgstr ""
9259   -
9260 9231 #: i18n/templates.c:443
9261 9232 msgid "User: #username# <br /> Action: #action# <br /> #reason#"
9262 9233 msgstr ""
... ... @@ -9276,6 +9247,8 @@ msgstr ""
9276 9247  
9277 9248 #: plugins/ktcore/admin/groupManagement.php:254
9278 9249 #: plugins/ktstandard/KTEmail.php:280
  9250 +#: plugins/ktcore/admin/workflowsv2.php:1909 i18n/templates.c:4124
  9251 +#: i18n/templates.c:4583
9279 9252 msgid "Users"
9280 9253 msgstr ""
9281 9254  
... ... @@ -9311,11 +9284,6 @@ msgstr ""
9311 9284 msgid "Users updated"
9312 9285 msgstr ""
9313 9286  
9314   -#: plugins/ktcore/admin/workflowsv2.php:1909 i18n/templates.c:4124
9315   -#: i18n/templates.c:4583
9316   -msgid "Users"
9317   -msgstr ""
9318   -
9319 9287 #: lib/documentmanagement/documentutil.inc.php:983
9320 9288 msgid "Validation Failed"
9321 9289 msgstr ""
... ... @@ -10641,11 +10609,11 @@ msgstr ""
10641 10609 msgid "Browse by..."
10642 10610 msgstr ""
10643 10611  
10644   -#: plugins/ktstandard/KTEmail.php:126
  10612 +#: plugins/ktstandard/KTEmail.php:126
10645 10613 msgid "Your colleague, %s, wishes you to view the attached document entitled '%s'."
10646 10614 msgstr ""
10647 10615  
10648   -#: plugins/browseabledashlet/templates/browseabledashlet/dashlet.smarty:8
  10616 +#: plugins/browseabledashlet/templates/browseabledashlet/dashlet.smarty:8
10649 10617 msgid "You have no orphaned folders."
10650 10618 msgstr ""
10651 10619  
... ... @@ -10666,6 +10634,8 @@ msgid "Add Dashlets"
10666 10634 msgstr ""
10667 10635  
10668 10636 #: resources/js/permissions.js:106
  10637 +#: i18n/templates.c:3320 i18n/templates.c:4031 i18n/templates.c:4403
  10638 +#: i18n/templates.c:4910
10669 10639 msgid "Role or Group"
10670 10640 msgstr ""
10671 10641  
... ... @@ -10674,9 +10644,6 @@ msgid "Available Transitions"
10674 10644 msgstr ""
10675 10645  
10676 10646 #: about.php:39
10677   -msgid "About"
10678   -msgstr ""
10679   -
10680 10647 #: lib/templating/kt3template.inc.php:356
10681 10648 msgid "About"
10682 10649 msgstr ""
... ... @@ -10705,3 +10672,11 @@ msgstr ""
10705 10672 #: plugins\network\extendedtransactioninfo\templates\extendedtransactioninfo\dashlet.smarty:2
10706 10673 msgid "There are no recent items."
10707 10674 msgstr ""
  10675 +
  10676 +#: templates\ktstandard\adminversion\dashlet.smarty:24
  10677 +msgid "We have further information on our website."
  10678 +msgstr ""
  10679 +
  10680 +#: plugins\ktcore\admin\documentTypes.php:103
  10681 +msgid "The system default document type can not be disabled. You may, however, rename it."
  10682 +msgstr ""
... ...
ktapi/ktapi.inc.php
  View file @053e0c5
1   -<?
  1 +<?php
2 2 /**
3 3 * $Id$
4 4 *
... ... @@ -575,7 +575,13 @@ class KTAPI
575 575 }
576 576 return $results;
577 577 }
  578 +
  579 + function get_dms_defaults()
  580 + {
  581 + global $default;
  582 + return $default;
  583 + }
578 584  
579 585 }
580 586  
581   -?>
582 587 \ No newline at end of file
  588 +?>
... ...
ktwebservice/webservice.php
  View file @053e0c5
1   -<?
  1 +<?php
2 2  
3 3 /**
4 4 *
... ... @@ -323,6 +323,19 @@ class KTWebService
323 323 'document_types' => "{urn:$this->namespace}kt_document_types_array"
324 324 );
325 325  
  326 + $this->__typedef["{urn:$this->namespace}kt_server_settings"] =
  327 + array(
  328 + 'explorer_metadata_capture' => 'boolean',
  329 + 'office_metadata_capture' => 'boolean'
  330 + );
  331 +
  332 + $this->__typedef["{urn:$this->namespace}kt_server_settings_response"] =
  333 + array(
  334 + 'status_code' => 'int',
  335 + 'message' => 'string',
  336 + 'settings' => "{urn:$this->namespace}kt_server_settings"
  337 + );
  338 +
326 339 /* methods */
327 340  
328 341 // login
... ... @@ -420,19 +433,19 @@ class KTWebService
420 433 // checkin_document
421 434 $this->__dispatch_map['checkin_document'] =
422 435 array('in' => array('session_id'=>'string','document_id'=>'int','filename'=>'string','reason' =>'string','tempfilename' =>'string', 'major_update'=>'boolean' ),
423   - 'out' => array( 'return' => "{urn:$this->namespace}kt_response" ),
  436 + 'out' => array( 'return' => "{urn:$this->namespace}kt_document_detail" ),
424 437 );
425 438  
426 439 // checkin_small_document
427 440 $this->__dispatch_map['checkin_small_document'] =
428 441 array('in' => array('session_id'=>'string','document_id'=>'int','filename'=>'string','reason' =>'string','base64' =>'string', 'major_update'=>'boolean' ),
429   - 'out' => array( 'return' => "{urn:$this->namespace}kt_response" ),
  442 + 'out' => array( 'return' => "{urn:$this->namespace}kt_document_detail" ),
430 443 );
431 444  
432 445 // checkin_base64_document
433 446 $this->__dispatch_map['checkin_base64_document'] =
434 447 array('in' => array('session_id'=>'string','document_id'=>'int','filename'=>'string','reason' =>'string','base64' =>'string', 'major_update'=>'boolean' ),
435   - 'out' => array( 'return' => "{urn:$this->namespace}kt_response" ),
  448 + 'out' => array( 'return' => "{urn:$this->namespace}kt_document_detail" ),
436 449 'alias' => 'checkin_small_document'
437 450 );
438 451  
... ... @@ -615,12 +628,19 @@ class KTWebService
615 628 array('in' => array('session_id'=>'string' ),
616 629 'out' => array( 'return' => "{urn:$this->namespace}kt_document_types_response" ),
617 630 );
  631 +
618 632 // get_document_link_types
619 633 $this->__dispatch_map['get_document_link_types'] =
620 634 array('in' => array('session_id'=>'string' ),
621 635 'out' => array( 'return' => "{urn:$this->namespace}kt_document_types_response" ),
622 636 );
623 637  
  638 + // get_server_settings
  639 + $this->__dispatch_map['get_server_settings'] =
  640 + array('in' => array('session_id'=>'string' ),
  641 + 'out' => array( 'return' => "{urn:$this->namespace}kt_server_settings_response" ),
  642 + );
  643 +
624 644  
625 645 }
626 646  
... ... @@ -2954,6 +2974,31 @@ class KTWebService
2954 2974 return $response;
2955 2975 }
2956 2976  
  2977 + /**
  2978 + * Retrieves the server settings for this server
  2979 + *
  2980 + * @param string $session_id
  2981 + * @return kt_server_settings_response
  2982 + */
  2983 + function get_server_settings($session_id)
  2984 + {
  2985 + $kt = &$this->get_ktapi($session_id );
  2986 + if (is_array($kt))
  2987 + {
  2988 + return new SOAP_Value('return',"{urn:$this->namespace}kt_response", $kt);
  2989 + }
  2990 +
  2991 + $dms_defaults = $kt->get_dms_defaults();
  2992 + $response['settings'] = array(
  2993 + 'explorer_metadata_capture' => $dms_defaults->explorerMetadataCapture,
  2994 + 'office_metadata_capture' => $dms_defaults->officeMetadataCapture
  2995 + );
  2996 + $response['message'] = 'Knowledgetree server settings retrieval succeeded.';
  2997 + $response['status_code'] = KTWS_SUCCESS;
  2998 +
  2999 + return $response;
  3000 + }
  3001 +
2957 3002 /**
2958 3003 * This runs the web service
2959 3004 *
... ...
lib/workflow/workflowutil.inc.php
  View file @053e0c5
... ... @@ -385,9 +385,11 @@ class KTWorkflowUtil {
385 385 if (is_null($oWorkflow)) {
386 386 return true;
387 387 }
388   - if (!in_array($sName, KTWorkflowUtil::getControlledActionsForWorkflow($oWorkflow))) {
389   - return true;
390   - }
  388 + // FIXME: The workflow_actions table that the method below uses is always empty!
  389 + // It seems the new method was never followed though to completion.
  390 + //if (!in_array($sName, KTWorkflowUtil::getControlledActionsForWorkflow($oWorkflow))) {
  391 + // return true;
  392 + //}
391 393 $oState =& KTWorkflowState::getByDocument($oDocument);
392 394 if (in_array($sName, KTWorkflowUtil::getDisabledActionsForState($oState))) {
393 395 return false;
... ...