From b0291eeba4ec2e6ef36ac8763ee5ca01e0bddfdd Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Tue, 1 Jun 2021 09:29:30 +0800
Subject: [PATCH] * Fix bug #38644.

---
 module/custom/control.php                      | 13 -------------
 module/custom/lang/de.php                      |  1 -
 module/custom/lang/en.php                      |  1 -
 module/custom/lang/fr.php                      |  1 -
 module/custom/lang/vi.php                      |  1 -
 module/custom/lang/zh-cn.php                   |  1 -
 module/custom/lang/zh-tw.php                   |  1 -
 module/custom/view/browsestoryconcept.html.php | 15 +--------------
 module/group/lang/resource.php                 |  5 +----
 9 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/module/custom/control.php b/module/custom/control.php
index f0b13b6818..485c0b7b36 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -420,19 +420,6 @@ class custom extends control
         $this->display();
     }
 
-    /**
-     * Set story concept.
-     *
-     * @param  int   $key
-     * @access public
-     * @return void
-     */
-    public function setDefaultConcept($key = 0)
-    {
-        $this->loadModel('setting')->setItem('system.custom.URSR', $key);
-        die(js::reload('parent'));
-    }
-
     /**
      * Delete story concept.
      *
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 0066022c91..6107d9937b 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -38,7 +38,6 @@ $lang->custom->waterfallCommon      = "Waterfall";
 $lang->custom->buildin              = "Buildin";
 $lang->custom->editStoryConcept     = "Edit Story Concept";
 $lang->custom->setStoryConcept      = "Set Story Concept";
-$lang->custom->setDefaultConcept    = "Set Default Concept";
 $lang->custom->browseStoryConcept   = "List of story concepts";
 $lang->custom->deleteStoryConcept   = "Delete story Concept";
 $lang->custom->URConcept            = "UR Concept";
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 6473f51d14..00235b1846 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -38,7 +38,6 @@ $lang->custom->waterfallCommon      = "Waterfall";
 $lang->custom->buildin              = "Buildin";
 $lang->custom->editStoryConcept     = "Edit Story Concept";
 $lang->custom->setStoryConcept      = "Set Story Concept";
-$lang->custom->setDefaultConcept    = "Set Default Concept";
 $lang->custom->browseStoryConcept   = "List of story concepts";
 $lang->custom->deleteStoryConcept   = "Delete story Concept";
 $lang->custom->URConcept            = "UR Concept";
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index dc63dcbc5b..77a1a51ad0 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -38,7 +38,6 @@ $lang->custom->waterfallCommon      = "Waterfall";
 $lang->custom->buildin              = "Buildin";
 $lang->custom->editStoryConcept     = "Edit Story Concept";
 $lang->custom->setStoryConcept      = "Set Story Concept";
-$lang->custom->setDefaultConcept    = "Set Default Concept";
 $lang->custom->browseStoryConcept   = "List of story concepts";
 $lang->custom->deleteStoryConcept   = "Delete story Concept";
 $lang->custom->URConcept            = "UR Concept";
diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php
index f4a8b48a17..ddffc57c45 100644
--- a/module/custom/lang/vi.php
+++ b/module/custom/lang/vi.php
@@ -38,7 +38,6 @@ $lang->custom->waterfallCommon      = "Waterfall";
 $lang->custom->buildin              = "Buildin";
 $lang->custom->editStoryConcept     = "Edit Story Concept";
 $lang->custom->setStoryConcept      = "Set Story Concept";
-$lang->custom->setDefaultConcept    = "Set Default Concept";
 $lang->custom->browseStoryConcept   = "List of story concepts";
 $lang->custom->deleteStoryConcept   = "Delete story Concept";
 $lang->custom->URConcept            = "UR Concept";
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 60b1e10b0b..23a648b109 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -38,7 +38,6 @@ $lang->custom->waterfallCommon      = "瀑布";
 $lang->custom->buildin              = "系统内置";
 $lang->custom->editStoryConcept     = "编辑需求概念";
 $lang->custom->setStoryConcept      = "设置需求概念";
-$lang->custom->setDefaultConcept    = "设置默认概念";
 $lang->custom->browseStoryConcept   = "需求概念列表";
 $lang->custom->deleteStoryConcept   = "删除需求概念";
 $lang->custom->URConcept            = "用需概念";
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index 5dff2482e1..2e63c697f2 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -38,7 +38,6 @@ $lang->custom->waterfallCommon      = "瀑布";
 $lang->custom->buildin              = "系統內置";
 $lang->custom->editStoryConcept     = "編輯需求概念";
 $lang->custom->setStoryConcept      = "設置需求概念";
-$lang->custom->setDefaultConcept    = "設置預設概念";
 $lang->custom->browseStoryConcept   = "需求概念列表";
 $lang->custom->deleteStoryConcept   = "刪除需求概念";
 $lang->custom->URConcept            = "用需概念";
diff --git a/module/custom/view/browsestoryconcept.html.php b/module/custom/view/browsestoryconcept.html.php
index d7555e869f..a369471976 100644
--- a/module/custom/view/browsestoryconcept.html.php
+++ b/module/custom/view/browsestoryconcept.html.php
@@ -11,7 +11,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <style>
-    .table-form>tbody>tr>th{text-align: center}
+.table-form>tbody>tr>th{text-align: center}
 </style>
 <div id='mainMenu' class='clearfix'>
   <div class='pull-right'>
@@ -23,9 +23,6 @@
       <table class='table table-form'>
         <thead>
           <tr>
-            <?php if(common::hasPriv('custom', 'setDefaultConcept')):?>
-            <th class='w-60px text-center'><?php echo $lang->custom->default;?> </th>
-            <?php endif;?>
             <?php if($this->config->URAndSR):?>
             <th class='text-left'><?php echo $lang->custom->URConcept;?> </th>
             <?php endif;?>
@@ -36,9 +33,6 @@
         <tbody>
         <?php foreach($URSRList as $key => $URSR):?>
           <tr>
-            <?php if(common::hasPriv('custom', 'setDefaultConcept')):?>
-            <td class='text-center'><input type="radio" name='default' value='<?php echo $key;?>' <?php if($key == $config->custom->URSR) echo 'checked';?>></td>
-            <?php endif;?>
             <?php if($this->config->URAndSR):?>
             <td class='text-left'><?php echo $URSR['URName'];?></td>
             <?php endif;?>
@@ -54,11 +48,4 @@
       </table>
   </div>
 </div>
-<script>
-$("input[name='default']").change(function()
-{
-    var checked = $(this).val();
-    hiddenwin.location.href = createLink('custom', 'setDefaultConcept', 'key=' + checked);
-})
-</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 1259b6bf83..cbca515e89 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1081,7 +1081,6 @@ $lang->resource->custom->timezone           = 'timezone';
 $lang->resource->custom->setStoryConcept    = 'setStoryConcept';
 $lang->resource->custom->editStoryConcept   = 'editStoryConcept';
 $lang->resource->custom->browseStoryConcept = 'browseStoryConcept';
-$lang->resource->custom->setDefaultConcept  = 'setDefaultConcept';
 $lang->resource->custom->deleteStoryConcept = 'deleteStoryConcept';
 
 $lang->custom->methodOrder[5]  = 'index';
@@ -1096,8 +1095,7 @@ $lang->custom->methodOrder[45] = 'timezone';
 $lang->custom->methodOrder[50] = 'setStoryConcept';
 $lang->custom->methodOrder[55] = 'editStoryConcept';
 $lang->custom->methodOrder[60] = 'browseStoryConcept';
-$lang->custom->methodOrder[65] = 'setDefaultConcept';
-$lang->custom->methodOrder[70] = 'deleteStoryConcept';
+$lang->custom->methodOrder[65] = 'deleteStoryConcept';
 
 $lang->resource->datatable = new stdclass();
 $lang->resource->datatable->setGlobal = 'setGlobal';
@@ -1808,7 +1806,6 @@ $lang->changelog['15.0.rc1'][] = 'user-execution';
 $lang->changelog['15.0.rc1'][] = 'custom-setStoryConcept';
 $lang->changelog['15.0.rc1'][] = 'custom-editStoryConcept';
 $lang->changelog['15.0.rc1'][] = 'custom-browseStoryConcept';
-$lang->changelog['15.0.rc1'][] = 'custom-setDefaultConcept';
 $lang->changelog['15.0.rc1'][] = 'custom-deleteStoryConcept';
 $lang->changelog['15.0.rc1'][] = 'search-index';
 $lang->changelog['15.0.rc1'][] = 'search-buildIndex';