- fix typo in subscription-display that caused significant degradation.

- fix manage to show folder subscriptions. - fix browse to have subscription portlet - fix documentFields to allow fieldset and field addition and editing. - fix fieldsetDisplay to not crash on metadata-lookups. - fix partialquery to not show multiple copies of a given file. - git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4453 c91229c3-7414-0410-bfa2-8a42b809f60b

- fix typo in subscription-display that caused significant degradation.
- fix manage to show folder subscriptions. - fix browse to have subscription portlet - fix documentFields to allow fieldset and field addition and editing. - fix fieldsetDisplay to not crash on metadata-lookups. - fix partialquery to not show multiple copies of a given file. - git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4453 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 7c5945c8
Showing 10 changed files with 19 additions and 12 deletions
lib/browse/PartialQuery.inc.php
lib/widgets/fieldsetDisplay.inc.php
plugins/ktcore/admin/documentFields.php
presentation/lookAndFeel/knowledgeTree/browse.php
templates/kt3/notifications/subscriptions.CheckinDocument.smarty
templates/kt3/notifications/subscriptions.CheckoutDocument.smarty
templates/kt3/notifications/subscriptions.ModifyDocument.smarty
templates/kt3/notifications/subscriptions.MoveDocument.smarty
templates/kt3/notifications/subscriptions.RemoveChildDocument.smarty
templates/ktstandard/subscriptions/manage.smarty
@@ -222,7 +222,7 @@ class SimpleSearchQuery extends PartialQuery {
  
     function getDocumentCount() { 
         $aOptions = array(
-            'select' => 'count(D.id) AS cnt',
+            'select' => 'count(DISTINCT D.id) AS cnt',
         );
         $aQuery = $this->getQuery($aOptions);
         $iRet = DBUtil::getOneResultKey($aQuery, 'cnt');
@@ -236,7 +236,7 @@ class SimpleSearchQuery extends PartialQuery {
     // we also leak like ---- here, since getting the score is ... fiddly.  and expensive.
     function getDocuments($iBatchSize, $iBatchStart, $sSortColumn, $sSortOrder, $sJoinClause = null, $aJoinParams = null) { 
         $aOptions = array(
-            'select' => 'D.id AS id',
+            'select' => 'DISTINCT D.id AS id',
         );
         list($sQuery, $aParams) = $this->getQuery($aOptions);
  
@@ -299,7 +299,7 @@ class BooleanSearchQuery extends PartialQuery {
  
     function getDocumentCount() { 
         $aOptions = array(
-            'select' => 'count(D.id) AS cnt',
+            'select' => 'count(DISTINCT D.id) AS cnt',
         );
         $aQuery = $this->getQuery($aOptions);
         $iRet = DBUtil::getOneResultKey($aQuery, 'cnt');
@@ -313,7 +313,7 @@ class BooleanSearchQuery extends PartialQuery {
     // we also leak like ---- here, since getting the score is ... fiddly.  and expensive.
     function getDocuments($iBatchSize, $iBatchStart, $sSortColumn, $sSortOrder, $sJoinClause = null, $aJoinParams = null) { 
         $aOptions = array(
-            'select' => 'D.id AS id',
+            'select' => 'DISTINCT D.id AS id',
         );
         list($sQuery, $aParams) = $this->getQuery($aOptions);
  
@@ -55,7 +55,7 @@ function getWidgetForMetadataField($field, $current_value, $page, $errors = null
            // FIXME we need to somehow handle both value-value and id-value here
            // extract the lookup.
             if ($vocab === null) { // allow override
-                $lookups = MetaData::getEnabledValuesByDocumentField($field);
+                $lookups = MetaData::getEnabledByDocumentField($field);
                 $fieldOptions["vocab"] = array(); // FIXME handle lookups
                 foreach ($lookups as $md) {
                     $fieldOptions["vocab"][$md->getName()] = $md->getName();
@@ -57,6 +57,8 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
         $editFieldset[] = new KTTextWidget('Description', _('A brief description of the information stored in this fieldset.'), 'description', $oFieldset->getDescription(), $this->oPage, true);                
         $createFields = array();
         $createFields[] = new KTStringWidget('Name', _('A human-readable name, used in add and edit forms.'), 'name',null, $this->oPage, true);
+        $createFields[] = new KTTextWidget('Description', _('A brief description of the information stored in this field.'), 'description', null, $this->oPage, true);                
+ 
  
         // type is a little more complex.
         $vocab = array();
@@ -118,12 +120,15 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
         $sName = KTUtil::arrayGet($_REQUEST, 'name');
         $sName = $this->oValidator->notEmpty($sName);
         $sNamespace = KTUtil::arrayGet($_REQUEST, 'namespace');
+	$sDescription = KTUtil::arrayGet($_REQUEST, 'description'); 
+        $sDescription = $this->oValidator->notEmpty($sDescription);
         if (empty($sNamespace)) {
             $sNamespace = KTUtil::nameToLocalNamespace('fieldsets', $sName);
         }
         $res = KTFieldset::createFromArray(array(
             'name' => $sName,
             'namespace' => $sNamespace,
+            'description' => $sDescription,
             'mandatory' => false,
             'isconditional' => false,
             'isgeneric' => $bIsGeneric,
@@ -153,6 +158,7 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
         $oField =& DocumentField::createFromArray(array(
             'name' => $_REQUEST['name'],
             'datatype' => 'STRING',
+	    'description' => $_REQUEST['description'],
             'haslookup' => $is_lookup,
             'haslookuptree' => $is_tree,
             'parentfieldset' => $oFieldset->getId(),
@@ -46,7 +46,7 @@ $sectionName = &quot;browse&quot;;
  
 class BrowseDispatcher extends KTStandardDispatcher {
  
-    
+    var $oFolder = null;    
     var $sSection = "browse";
     var $browse_mode = null;
     var $query = null;
@@ -84,6 +84,7 @@ class BrowseDispatcher extends KTStandardDispatcher {
                 $folder_id = 1;
                 $oFolder =& Folder::get($folder_id);
             }
+	    $this->oFolder =& $oFolder;
  
             // we now have a folder, and need to create the query.
             $this->oQuery =  new BrowseQuery($oFolder->getId());
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" has been checked in, in the folder "{info.location_name}".
+    The document "{$info.object_name}" has been checked in, in the folder "{$info.location_name}".
     <div class="actionoptions">    
         <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}">{i18n}View Document{/i18n}</a>
         <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" has been checked out, in the folder "{info.location_name}".
+    The document "{$info.object_name}" has been checked out, in the folder "{$info.location_name}".
     <div class="actionoptions">    
         <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}">{i18n}View Document{/i18n}</a>
         <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" has been changed in the folder "{info.location_name}".
+    The document "{$info.object_name}" has been changed in the folder "{$info.location_name}".
     <div class="actionoptions">    
         <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}">{i18n}View Document{/i18n}</a>
         <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" has been moved to the folder "{info.location_name}".
+    The document "{$info.object_name}" has been moved to the folder "{$info.location_name}".
     <div class="actionoptions">    
         <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}">{i18n}View New Location{/i18n}</a>
         <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" has been removed from the folder "{info.location_name}", to which you are subscribed.
+    The document "{$info.object_name}" has been removed from the folder "{$info.location_name}", to which you are subscribed.
     <div class="actionoptions">    
         <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}">{i18n}View Folder{/i18n}</a>
         <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
@@ -21,7 +21,7 @@ subscribe.{/i18n}&lt;/p&gt;
 {/if}
  
 {if $aDocumentSubscriptions}
-{entity_checkboxes name="documentsubscriptions" entities=$aFolderSubscriptions method=getContentLink assign=aCheckboxes}
+{entity_checkboxes name="documentsubscriptions" entities=$aDocumentSubscriptions method=getContentLink assign=aCheckboxes}
 {foreach from=$aCheckboxes item=oCheckbox}
 {$oCheckbox}<br />
 {/foreach}