diff --git a/module/program/config.php b/module/program/config.php index 4adbb3896d..730b39b501 100644 --- a/module/program/config.php +++ b/module/program/config.php @@ -117,5 +117,5 @@ $config->program->datatable->fieldList['PRJSurplus']['sort'] = 'no'; $config->program->datatable->fieldList['actions']['title'] = 'actions'; $config->program->datatable->fieldList['actions']['fixed'] = 'right'; -$config->program->datatable->fieldList['actions']['width'] = '240'; +$config->program->datatable->fieldList['actions']['width'] = '270'; $config->program->datatable->fieldList['actions']['required'] = 'yes'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index 0d7b514c64..4bbe3200bd 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -188,7 +188,7 @@ $lang->program->PGMActivate = '激活项目集'; $lang->program->PGMExport = '导出'; $lang->program->PGMStakeholder = '干系人列表'; $lang->program->createStakeholder = '添加干系人'; -$lang->program->unlinkStakeholder = '删除干系人'; +$lang->program->unlinkStakeholder = '移除干系人'; $lang->program->importStakeholder = '从父项目集导入'; $lang->program->PGMManageMembers = '项目集团队'; diff --git a/module/program/view/pgmbrowsebylist.html.php b/module/program/view/pgmbrowsebylist.html.php index c5c7c99046..53fc1f2f31 100644 --- a/module/program/view/pgmbrowsebylist.html.php +++ b/module/program/view/pgmbrowsebylist.html.php @@ -14,9 +14,6 @@ program->PGMBudget);?> program->PGMPM);?> actions;?> - - project->orderAB);?> - @@ -45,8 +42,9 @@ $trAttrs .= " class='$trClass'"; $originOrders[] = $program->order; ?> + > - + ' title='name?>'> type == 'program'):?> createLink('program', 'pgmproduct', "programID=$program->id"), $program->name);?> @@ -81,9 +79,6 @@ createLink("program", "prjdelete", "programID=$program->id"), "", 'hiddenwin', "class='btn' title='{$lang->delete}'");?> - - - @@ -124,19 +119,12 @@ $(function() }, finish: function(e) { - var items = []; + var projects = ''; e.list.each(function() { - var $item = $(this.item); - items.push({id: $item.data('id'), order: this.order}); + projects += $(this.item).data('id') + ',' ; }); - var orders = {}; - items.sort(function(x, y) {return x.order - y.order;}).forEach(function(item, index) - { - var newOrder = ordersList[index]; - orders[item.id] = typeof newOrder === 'number' ? newOrder : item.order * 5; - }); - $.post(createLink('program', 'updateOrder'), {'programs' : orders, 'orderBy' : orderBy}); + $.post(createLink('program', 'PRJUpdateOrder'), {'projects' : projects, 'orderBy' : orderBy}); var $thead = $list.closest('table').children('thead'); $thead.find('.headerSortDown, .headerSortUp').removeClass('headerSortDown headerSortUp').addClass('header'); diff --git a/module/program/view/pgmstakeholder.html.php b/module/program/view/pgmstakeholder.html.php index 5b1cbee931..85c7f16b92 100644 --- a/module/program/view/pgmstakeholder.html.php +++ b/module/program/view/pgmstakeholder.html.php @@ -55,7 +55,7 @@ createLink('program', 'unlinkStakeholder', "id=$stakeholder->id&programID=$programID&confirm=no"), '', 'hiddenwin', "title='{$lang->delete}' class='{$deleteClass}'"); + echo html::a($this->createLink('program', 'unlinkStakeholder', "id=$stakeholder->id&programID=$programID&confirm=no"), '', 'hiddenwin', "title='{$lang->program->unlinkStakeholder}' class='{$deleteClass}'"); ?> diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php index 43f5f59eb8..567a5ab5b1 100644 --- a/module/stakeholder/lang/zh-cn.php +++ b/module/stakeholder/lang/zh-cn.php @@ -6,7 +6,7 @@ $lang->stakeholder->batchCreate = '批量添加'; $lang->stakeholder->create = '添加干系人'; $lang->stakeholder->edit = '编辑干系人'; $lang->stakeholder->view = '干系人详情'; -$lang->stakeholder->delete = '删除干系人'; +$lang->stakeholder->delete = '移除干系人'; $lang->stakeholder->createdBy = '创建者'; $lang->stakeholder->createdDate = '创建时间'; $lang->stakeholder->search = '搜索'; diff --git a/module/stakeholder/lang/zh-tw.php b/module/stakeholder/lang/zh-tw.php index a01b951ae7..ecdca7ecad 100644 --- a/module/stakeholder/lang/zh-tw.php +++ b/module/stakeholder/lang/zh-tw.php @@ -6,7 +6,7 @@ $lang->stakeholder->batchCreate = '批量添加'; $lang->stakeholder->create = '添加干係人'; $lang->stakeholder->edit = '編輯干係人'; $lang->stakeholder->view = '干係人詳情'; -$lang->stakeholder->delete = '刪除干係人'; +$lang->stakeholder->delete = '移除干係人'; $lang->stakeholder->createdBy = '創建者'; $lang->stakeholder->createdDate = '創建時間'; $lang->stakeholder->search = '搜索';