From 006dfcc733aca1e784c347e474f605879c4bccfa Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 7 Jan 2021 13:15:36 +0800
Subject: [PATCH] * Fix doc button.

---
 module/doc/view/browse.html.php           |  6 +++---
 module/doc/view/objectlibs.html.php       |  2 +-
 module/doc/view/objectlibsbylist.html.php |  2 +-
 module/index/js/index.js                  | 10 ++++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index ad65207a33..0753a50ee5 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -57,7 +57,7 @@ var browseType = '<?php echo $browseType;?>';
             <ul class='dropdown-menu'>
               <?php foreach($lang->doc->typeList as $typeKey => $typeName):?>
               <?php $class = strpos($config->doc->officeTypes, $typeKey) !== false ? 'iframe' : '';?>
-              <li><?php echo html::a($this->createLink('doc', 'create', "libID=$libID&moduleID=$moduleID&type=$typeKey"), $typeName, '', "class='$class'");?></li>
+              <li><?php echo html::a($this->createLink('doc', 'create', "libID=$libID&moduleID=$moduleID&type=$typeKey"), $typeName, '', "class='$class' data-group=$from");?></li>
               <?php endforeach;?>
             </ul>
           </div>
@@ -75,7 +75,7 @@ var browseType = '<?php echo $browseType;?>';
           <?php if($libID):?>
           <span class="text-muted"><?php echo $lang->doc->noDoc;?></span>
           <?php if(common::hasPriv('doc', 'create') and common::canBeChanged('doc', $currentLib)):?>
-          <?php echo html::a($this->createLink('doc', 'create', "libID={$libID}&moduleID=$moduleID"), "<i class='icon icon-plus'></i> " . $lang->doc->create, '', "class='btn btn-info'");?>
+          <?php echo html::a($this->createLink('doc', 'create', "libID={$libID}&moduleID=$moduleID"), "<i class='icon icon-plus'></i> " . $lang->doc->create, '', "class='btn btn-info' data-group=$from");?>
           <?php endif;?>
           <?php elseif($browseType == 'byediteddate'):?>
           <span class="text-muted"><?php echo $lang->doc->noEditedDoc;?></span>
@@ -168,7 +168,7 @@ var browseType = '<?php echo $browseType;?>';
                 <?php if(common::hasPriv('doc', 'collect')):?>
                 <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
                 <?php endif;?>
-                <?php common::printLink('doc', 'edit', "docID=$doc->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link'")?>
+                <?php common::printLink('doc', 'edit', "docID=$doc->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link' data-group=$from")?>
                 <?php common::printLink('doc', 'delete', "docID=$doc->id", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
                 <?php endif;?>
               </td>
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index ab224bd850..540787c152 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -48,7 +48,7 @@
           <?php if($libID == 'files') $icon = 'icon-paper-clip text-brown';?>
 
           <div class="col">
-            <a class="file" href="<?php echo $libLink;?>">
+              <a class="file" href="<?php echo $libLink;?>" data-group=<?php echo $from;?>>
               <i class="file-icon icon <?php echo $icon;?>"></i>
               <div class="file-name"><?php echo ($libID != 'project' && $libID != 'files' && strpos($lib->collector, $this->app->user->account) !== false ? "<i class='icon icon-star text-yellow'></i> " : '') . $lib->name;?></div>
               <div class="text-primary file-info"><?php echo  $lib->allCount . $lang->doc->item;?></div>
diff --git a/module/doc/view/objectlibsbylist.html.php b/module/doc/view/objectlibsbylist.html.php
index e47b0ed9f7..a508769d2b 100644
--- a/module/doc/view/objectlibsbylist.html.php
+++ b/module/doc/view/objectlibsbylist.html.php
@@ -29,7 +29,7 @@
           <?php if($libID == 'project') $libLink = inlink('allLibs', "type=project&product=$object->id");?>
           <?php if($libID == 'files')   $libLink = inlink('showFiles', "type=$type&objectID=$object->id");?>
           <tr>
-            <td class="c-name"><?php echo html::a($libLink, $lib->name);?></td>
+            <td class="c-name"><?php echo html::a($libLink, $lib->name, '', "data-group=$from");?></td>
             <td class="c-num"><?php echo  $lib->allCount . $lang->doc->item;?></td>
             <td class="c-actions">
               <?php if($canBeChanged and $libID != 'project' and $libID != 'files'):?>
diff --git a/module/index/js/index.js b/module/index/js/index.js
index ad8a34a046..cd9915ffbf 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -67,12 +67,14 @@
         var methodLowerCase = methodName.toLowerCase();
         if(moduleName === 'doc')
         {
-            if(link.prj && ['browse', 'create', 'showfiles', 'objectlibs'].includes(methodLowerCase))
+            if(link.prj)
             {
-                var from = $.cookie('from');
-                if(from === 'project') return 'project';
-                if(from === 'product') return 'product';
+                if(methodLowerCase === 'objectlibs' && (link.params.from || link.params.$3) == 'product') return 'product';
+
+                return 'project';
             }
+
+            if(methodLowerCase === 'browse' && (link.params.from || link.params.$5) == 'product') return 'product';
             return 'doc';
         }
         if(moduleName === 'custom' && ['estimate', 'browsestoryconcept', 'configurescrum'].includes(methodLowerCase))