From 28feaa2a2cfb19f5f90d59132b1e16a60e81a14e Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Mon, 3 Apr 2023 13:41:07 +0800
Subject: [PATCH]  * code for task #89524.

---
 module/doc/model.php                   |  1 +
 module/doc/view/content.html.php       | 12 ++++-
 module/doc/view/doclist.html.php       | 11 ++++-
 module/doc/view/editothertype.html.php | 61 +++++++++-----------------
 4 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index 11e1b82821..75f0f47109 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -912,6 +912,7 @@ class docModel extends model
         if($changed)
         {
             $docContent          = new stdclass();
+            $docContent->doc     = $oldDoc->id;
             $docContent->title   = $doc->title;
             $docContent->content = isset($doc->content) ? $doc->content : '';
             $docContent->files   = $oldDocContent->files;
diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php
index 33d509272f..20e28b2f48 100644
--- a/module/doc/view/content.html.php
+++ b/module/doc/view/content.html.php
@@ -32,7 +32,17 @@
           <div class="actions">
             <?php
             echo html::a("javascript:fullScreen()", '<i class="icon-fullscreen"></i>', '', "title='{$lang->fullscreen}' class='btn btn-link fullscreen-btn'");
-            if(common::hasPriv('doc', 'edit')) echo html::a(inlink('edit', "docID=$doc->id&comment=false&objectType=$objectType&objectID=$object->id&libID=$libID"), '<i class="icon-edit"></i>', '', "title='{$lang->doc->edit}' class='btn btn-link' data-app='{$this->app->tab}'");
+            if(common::hasPriv('doc', 'edit'))
+            {
+                $iframe   = '';
+                $onlybody = false;
+                if($doc->type != 'text' or isonlybody())
+                {
+                    $iframe   = 'iframe';
+                    $onlybody = 'true';
+                }
+                echo html::a(inlink('edit', "docID=$doc->id&comment=false&objectType=$objectType&objectID=$object->id&libID=$libID", '', $onlybody), '<i class="icon-edit"></i>', '', "title='{$lang->doc->edit}' class='btn btn-link $iframe' data-app='{$this->app->tab}'");
+            }
             if(common::hasPriv('doc', 'delete'))
             {
                 $deleteURL = $this->createLink('doc', 'delete', "docID=$doc->id&confirm=yes&from=lib");
diff --git a/module/doc/view/doclist.html.php b/module/doc/view/doclist.html.php
index 16586e9ab4..0538457ed6 100644
--- a/module/doc/view/doclist.html.php
+++ b/module/doc/view/doclist.html.php
@@ -101,7 +101,16 @@ body {margin-bottom: 25px;}
           <td class="c-datetime"><?php echo formatTime($doc->editedDate, 'Y-m-d');?></td>
           <td class="c-actions">
             <?php if(common::canBeChanged('doc', $doc)):?>
-            <?php common::printLink('doc', 'edit', "docID=$doc->id&comment=false", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn'", true, false)?>
+            <?php
+            $iframe   = '';
+            $onlybody = false;
+            if($doc->type != 'text' or isonlybody())
+            {
+                $iframe   = 'iframe';
+                $onlybody = true;
+            }
+            ?>
+            <?php common::printLink('doc', 'edit', "docID=$doc->id&comment=false", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn $iframe'", true, $onlybody);?>
             <?php common::printLink('doc', 'delete', "docID=$doc->id&confirm=no", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn'")?>
             <?php endif;?>
           </td>
diff --git a/module/doc/view/editothertype.html.php b/module/doc/view/editothertype.html.php
index 332467034f..0928aff2a6 100644
--- a/module/doc/view/editothertype.html.php
+++ b/module/doc/view/editothertype.html.php
@@ -25,53 +25,30 @@
         <?php echo html::a($this->createLink('doc', 'view', "docID=$doc->id"), $doc->title, '', "title='$doc->title'");?>
         <small> <?php echo $lang->arrow . ' ' . $lang->doc->edit;?></small>
       </h2>
-      <div class='pull-right'><?php echo html::a('###', $lang->save, '', 'id="top-submit" class="btn btn-primary"');?></div>
     </div>
     <form class='load-indicator main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform'>
       <table class='table table-form'>
+        <?php if(strpos('product|project|execution', $type) !== false):?>
         <tr>
-          <th class='w-110px'><?php echo $lang->doc->lib;?></th>
-          <td> <?php echo html::select('lib', $libs, $doc->lib, "class='form-control chosen' onchange=loadDocModule(this.value)");?> </td><td></td>
+          <th><?php echo $lang->doc->project;?></th>
+          <td class='required'><?php echo html::select($type, $objects, $objectID, "class='form-control chosen' onchange='loadObjectModules(\"{$type}\", this.value)'");?></td>
         </tr>
+        <?php endif;?>
         <tr>
-          <th><?php echo $lang->doc->module;?></th>
-          <td>
-            <span id='moduleBox'><?php echo html::select('module', $moduleOptionMenu, $doc->module, "class='form-control chosen'");?></span>
-          </td><td></td>
+          <th class='w-100px'><?php echo $lang->doc->libAndModule?></th>
+          <td colspan='3' class='required'><span id='moduleBox'><?php echo html::select('module', $moduleOptionMenu, $doc->lib . '_' . $doc->module, "class='form-control chosen'");?></span></td>
         </tr>
         <tr>
           <th><?php echo $lang->doc->title;?></th>
-          <td colspan='2'><?php echo html::input('title', $doc->title, "class='form-control' required");?></td>
+          <td colspan='3'><?php echo html::input('title', $doc->title, "class='form-control' required");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->doc->keywords;?></th>
-          <td colspan='2'><?php echo html::input('keywords', $doc->keywords, "class='form-control' placeholder='{$lang->doc->keywordsTips}'");?></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->doc->type;?></th>
-          <td>
-            <?php
-            $typeList = $lang->doc->types;
-            if(!isset($lang->doc->types[$doc->type])) $typeList = $lang->doc->typeList;
-            echo html::radio('type', array($doc->type => zget($typeList, $doc->type)), $doc->type);
-            ?>
-          </td>
-        </tr>
-        <tr id='contentBox' <?php if($doc->type == 'url') echo "class='hidden'"?>>
-          <th><?php echo $lang->doc->content;?></th>
-          <td colspan='2'><?php echo html::textarea('content', $doc->type == 'url' ? '' : htmlSpecialString($doc->content), "style='width:100%; height:200px'") . html::hidden('contentType', $doc->contentType);?></td>
-        </tr>
-        <tr id='urlBox' <?php if($doc->type != 'url') echo "class='hidden'"?>>
-          <th><?php echo $lang->doc->url;?></th>
-          <td colspan='2'><?php echo html::input('url', $doc->type == 'url' ? $doc->content : '', "class='form-control'");?></td>
-        </tr>
-        <tr id='fileBox'>
-          <th><?php echo $lang->doc->files;?></th>
-          <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
+          <td colspan='3'><?php echo html::input('keywords', $doc->keywords, "class='form-control' placeholder='{$lang->doc->keywordsTips}'");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->doc->mailto;?></th>
-          <td colspan="2">
+          <td colspan="3">
             <div class="input-group">
               <?php
               echo html::select('mailto[]', $users, $doc->mailto, "multiple class='form-control picker-select' data-drop-direction='top'");
@@ -81,16 +58,14 @@
           </td>
         </tr>
         <tr>
-          <th><?php echo $lang->doclib->control;?></th>
-          <td colspan='2'>
-            <?php $acl = $lib->acl == 'private' ? 'private' : $doc->acl;?>
-            <?php echo html::radio('acl', $lang->doc->aclList, $acl, "onchange='toggleAcl(this.value, \"doc\")'")?>
-            <span class='text-info' id='noticeAcl'><?php echo $lang->doc->noticeAcl['doc'][$acl];?></span>
+          <th class="th-control text-top"><?php echo $lang->doclib->control;?></th>
+          <td colspan='3' class='aclBox'>
+            <?php echo html::radio('acl', $lang->doc->aclList, $doc->acl, "onchange='toggleAcl(this.value, \"doc\")'")?>
           </td>
         </tr>
-        <tr id='whiteListBox' class='hidden'>
+        <tr id='whiteListBox' class='<?php if($doc->acl == 'open') echo 'hidden';?>'>
           <th><?php echo $lang->doc->whiteList;?></th>
-          <td colspan='2'>
+          <td colspan='3'>
             <div class='input-group w-p100'>
               <span class='input-group-addon groups-addon'><?php echo $lang->doclib->group?></span>
               <?php echo html::select('groups[]', $groups, $doc->groups, "class='form-control picker-select' multiple data-drop-direction='top'")?>
@@ -98,15 +73,19 @@
             <div class='input-group w-p100'>
               <span class='input-group-addon'><?php echo $lang->doclib->user?></span>
               <?php echo html::select('users[]', $users, $doc->users, "class='form-control picker-select' multiple data-drop-direction='top'")?>
+              <?php echo $this->fetch('my', 'buildContactLists', "dropdownName=users");?>
             </div>
           </td>
         </tr>
         <tr>
-          <td colspan='3' class='text-center form-actions'>
+          <td colspan='4' class='text-center form-actions'>
             <?php
+            echo html::hidden('contentType', $doc->contentType);
+            echo html::hidden('type', $doc->type);
             echo html::hidden('editedDate', $doc->editedDate);
+            echo html::hidden('status', $doc->status);
+            echo html::hidden('parent', $doc->parent);
             echo html::submitButton();
-            echo html::backButton($lang->goback, "data-app='{$app->tab}'");
             ?>
           </td>
         </tr>