Merge branch 'sprint/tianshujie_modifyTip' into 'master'

* Modify Modify program prompt when editing a product.

See merge request easycorp/zentaopms!3996

module/product/lang/en.php

@@ -31,6 +31,7 @@ $lang->product->newLine         = "Create {$lang->productCommon} Line";
 $lang->product->export           = 'Export';
 $lang->product->dashboard        = "Dashboard";
 $lang->product->changeProgram    = "{$lang->productCommon} confirmation of the scope of influence of adjustment of the program set";
+$lang->product->changeProgramTip = "%s > Change Program";
 $lang->product->addWhitelist     = 'Add Whitelist';
 $lang->product->unbindWhitelist  = 'Unbind Whitelist';
 
@@ -86,7 +87,7 @@ $lang->product->confirmDelete        = " Do you want to delete the {$lang->produ
 $lang->product->errorNoProduct       = "No {$lang->productCommon} is created yet!";
 $lang->product->accessDenied         = "You have no access to the {$lang->productCommon}.";
 $lang->product->programChangeTip     = "The projects linked with this {$lang->productCommon}: %s will be transferred to the modified program set together.";
-$lang->product->notChangeProgramTip  = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following projects, please cancel the link before proceeding";
+$lang->product->notChangeProgramTip  = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following projects, please click the project name to enter the {$lang->SRCommon} list to cancel the link before proceeding";
 $lang->product->confirmChangeProgram = "The projects linked with this {$lang->productCommon}: %s is also linked with other products, whether to transfer projects to the modified program set.";
 $lang->product->changeProgramError   = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the project, please unlink it before proceeding";
 $lang->product->changeLineError      = "Products already exist under the product line, so the program within them cannot be modified.";

module/product/lang/zh-cn.php

@@ -31,6 +31,7 @@ $lang->product->newLine         = "新建{$lang->productCommon}线";
 $lang->product->export           = '导出数据';
 $lang->product->dashboard        = "{$lang->productCommon}仪表盘";
 $lang->product->changeProgram    = "{$lang->productCommon}调整所属项目集影响范围确认";
+$lang->product->changeProgramTip = "%s > 修改项目集";
 $lang->product->addWhitelist     = '添加白名单';
 $lang->product->unbindWhitelist  = '移除白名单';
 
@@ -86,7 +87,7 @@ $lang->product->confirmDelete        = " 您确定删除该{$lang->productCommon
 $lang->product->errorNoProduct       = "还没有创建{$lang->productCommon}！";
 $lang->product->accessDenied         = "您无权访问该{$lang->productCommon}";
 $lang->product->programChangeTip     = "如下项目只关联了该{$lang->productCommon}， 将直接转移至新项目集下。";
-$lang->product->notChangeProgramTip  = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到如下项目，请取消关联后再操作";
+$lang->product->notChangeProgramTip  = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到如下项目，请点击项目名称进入{$lang->SRCommon}列表取消关联后再操作";
 $lang->product->confirmChangeProgram = "如下项目既关联了该{$lang->productCommon}又关联了其他{$lang->productCommon}，请确认是否继续关联该{$lang->productCommon}，勾选后将取消与其他{$lang->productCommon}的关联关系，同时转移至新项目集下。";
 $lang->product->changeProgramError   = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到项目，请取消关联后再操作";
 $lang->product->changeLineError      = "产品线下已有产品，不可修改所属项目集。";

module/product/view/edit.html.php

@@ -21,6 +21,7 @@
 <?php js::set('projectPathList', $projectPathList);?>
 <style>
 #changeProgram .icon-project {padding-right: 5px;}
+#changeProgram .modal-body {padding-top: 10px;}
 </style>
 <div id="mainContent" class="main-content">
   <div class="center-block">
@@ -115,6 +116,8 @@
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon icon-close"></i></button>
         <?php if($canChangeProgram):?>
         <h4 class="modal-title"><?php echo $lang->product->changeProgram;?></h4>
+        <?php else:?>
+        <h4 class="modal-title"><?php echo sprintf($lang->product->changeProgramTip, $product->name);?></h4>
         <?php endif;?>
       </div>
       <div class="modal-body">
@@ -123,9 +126,11 @@
           <tr>
             <th class='text-left'><?php echo $lang->product->notChangeProgramTip;?></th>
           </tr>
-          <?php foreach($linkStoriesProjects as $project):?>
+          <?php foreach($linkStoriesProjects as $projectID => $projectName):?>
           <tr>
-            <td><i class="icon icon-project"></i><?php echo $project;?></td>
+            <td>
+              <?php echo html::a($this->createLink('projectstory', 'story', 'projectID=' . $projectID), "<i class='icon icon-project'></i>" . $projectName, '', "title='$projectName'");?>
+            </td>
           </tr>
           <?php endforeach;?>
           <?php endif;?>