Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/master_zhouxudong_projectBug' into 'master'

Browse Source 
Sprint/master zhouxudong project bug

See merge request easycorp/zentaopms!4215
This commit is contained in:
孙广明
2022-06-29 07:11:40 +00:00
parent 102beda14d 0a86bc474f
commit e54064bcfe
6 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/de.php
+2 -1
View File
@@ -23,7 +23,7 @@ $lang->group->byModuleTips = '<span class="tips">(SHIFT/STRG für Multi-Se
$lang->group->allTips = 'After checking this option, the administrator can manage all objects in the system, including objects created later.';
$lang->group->manageMember = 'Mitglieder';
$lang->group->manageProjectAdmin = 'Manage Program Admins';
$lang->group->confirmDelete = 'Möchten Sie die Gruppe löschen?';
$lang->group->confirmDelete = "Do you want to delete '%s'?";
$lang->group->successSaved = 'Gespeichert!';
$lang->group->errorNotSaved = 'Fehlgeschlagen. Bitte aktion und Gruppe wählen.';
$lang->group->viewList = 'Anzeige ist zulässig.';
@@ -45,6 +45,7 @@ $lang->group->project = 'Project';
$lang->group->group = 'Group';
$lang->group->more = 'More';
$lang->group->allCheck = 'All';
$lang->group->noGroup = 'No group';
global $config;
if($config->systemMode == 'new') $lang->group->noneProject = 'No Project';
module/group/lang/en.php
+1
View File
@@ -45,6 +45,7 @@ $lang->group->project = 'Project';
$lang->group->group = 'Group';
$lang->group->more = 'More';
$lang->group->allCheck = 'All';
$lang->group->noGroup = 'No group';
global $config;
if($config->systemMode == 'new') $lang->group->noneProject = 'No Project';
module/group/lang/fr.php
+2 -1
View File
@@ -23,7 +23,7 @@ $lang->group->byModuleTips = '<span class="tips">(Shift/Ctrl pour sélecti
$lang->group->allTips = 'After checking this option, the administrator can manage all objects in the system, including objects created later.';
$lang->group->manageMember = 'Gérer Membres';
$lang->group->manageProjectAdmin = 'Manage Program Admins';
$lang->group->confirmDelete = "Voulez-vous supprimer ce groupe d'utilisateurs ?";
$lang->group->confirmDelete = "Voulez - vous supprimer '%s'?";
$lang->group->successSaved = 'Sauvé.';
$lang->group->errorNotSaved = 'Echec. Veuillez sélectionner actions et groupes.';
$lang->group->viewList = 'Accès Consultation';
@@ -45,6 +45,7 @@ $lang->group->project = 'Project';
$lang->group->group = 'Group';
$lang->group->more = 'More';
$lang->group->allCheck = 'All';
$lang->group->noGroup = 'Aucun groupe';
global $config;
if($config->systemMode == 'new') $lang->group->noneProject = 'No Project';
module/group/lang/zh-cn.php
+1
View File
@@ -45,6 +45,7 @@ $lang->group->project = '项目';
$lang->group->group = '分组';
$lang->group->more = '更多';
$lang->group->allCheck = '全部';
$lang->group->noGroup = '暂时没有分组。';
global $config;
if($config->systemMode == 'new') $lang->group->noneProject = '暂时没有项目';
module/group/view/browse.html.php
+3 -3
View File
@@ -67,9 +67,9 @@
}
else
{
$deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
js::set("confirmDelete{$group->id}", sprintf($lang->group->confirmDelete, $group->name));
echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete{$group->id})", '<i class="icon icon-trash"></i>', '', "title='{$lang->group->delete}' class='btn'");
$deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
$confirmDelete = htmlspecialchars(sprintf($lang->group->confirmDelete, $group->name));
echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", \"$confirmDelete\")", '<i class="icon icon-trash"></i>', '', "title='{$lang->group->delete}' class='btn'");
}
}
?>
module/project/view/group.html.php
+12 -4
View File
@@ -12,6 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php js::set('confirmDelete', $lang->group->confirmDelete);?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php // echo html::backButton($lang->goback, '', 'btn-secondary');?>
@@ -22,6 +23,13 @@
</div>
</div>
<div id='mainContent' class='main-table'>
<?php if(empty($groups)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->group->noGroup;?></span>
</p>
</div>
<?php else:?>
<table class='table tablesorter' id='groupList'>
<thead>
<tr>
@@ -34,7 +42,6 @@
</thead>
<tbody>
<?php foreach($groups as $group):?>
<?php $confirmDelete = sprintf($lang->group->confirmDelete, $group->name);?>
<?php $users = implode(',', $groupUsers[$group->id]);?>
<tr>
<td class='text-center'><?php echo $group->id;?></td>
@@ -52,8 +59,9 @@
<?php
if(common::hasPriv('group', 'delete') and $group->role != 'limited')
{
$deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
echo html::a("###", '<i class="icon icon-trash"></i>', '', "onclick='ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete)' title='{$lang->group->delete}' class='btn btn-icon'");
$deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
$confirmDelete = htmlspecialchars(sprintf($lang->group->confirmDelete, $group->name));
echo html::a("###", '<i class="icon icon-trash"></i>', '', "onclick='ajaxDelete(\"$deleteURL\", \"groupList\", \"$confirmDelete\")' title='{$lang->group->delete}' class='btn btn-icon'");
}
else
{
@@ -65,6 +73,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php endif;?>
</div>
<?php js::set('confirmDelete', $confirmDelete);?>
<?php include '../../common/view/footer.html.php';?>