- |
+ |
account => sprintf('%03d', $user->id)));?>
@@ -81,26 +81,28 @@ js::set('confirmDelete', $lang->user->confirmDelete);
|
account", $user->realname, '', "title='$user->realname'")) echo $user->realname;?> |
account;?> |
- user->roleList, $user->role, '');?> |
- email);?> |
- user->genderList[$user->gender])) echo $lang->user->genderList[$user->gender];?> |
+ user->roleList, $user->role, '');?> |
+ email);?> |
+ user->genderList[$user->gender])) echo $lang->user->genderList[$user->gender];?> |
phone;?> |
qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?> |
- last) echo date('Y-m-d', $user->last);?> |
- visits;?> |
+ last) echo date('Y-m-d', $user->last);?> |
+ visits;?> |
- ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin", 'btn-link');?>
+ ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin");
+ if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
+ {
+ common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', '', "hiddenwin");
+ }
+ ?>
id&from=company", '', 'button');
+ common::printIcon('user', 'edit', "userID=$user->id&from=company", '', 'list');
if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete'))
{
- echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '', '', "title='{$lang->user->delete}' class='btn btn-link iframe'");
- }
- if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
- {
- common::printIcon('user', 'unlock', "userID=$user->account", '', 'button', '', "hiddenwin");
+ echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '', '', "title='{$lang->user->delete}' class='btn iframe'");
}
?>
|
diff --git a/module/datatable/view/ajaxcustom.html.php b/module/datatable/view/ajaxcustom.html.php
index 406b29652e..4533254625 100644
--- a/module/datatable/view/ajaxcustom.html.php
+++ b/module/datatable/view/ajaxcustom.html.php
@@ -71,7 +71,7 @@
datatable->width?> '>
-
+
({$lang->datatable->required})"?>
diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php
index 41312eee06..02ed975ed1 100644
--- a/module/group/view/browse.html.php
+++ b/module/group/view/browse.html.php
@@ -44,10 +44,10 @@
|
group->managepriv = $lang->group->managePrivByGroup;?>
- id", $group, 'list', 'pencil');?>
- id", $group, 'list', 'pencil');?>
+ id", $group, 'list', 'eye');?>
+ id", $group, 'list', 'lock');?>
group->managemember = $lang->group->manageMember;?>
- id", $group, 'list', 'pencil', '', 'iframe', 'yes');?>
+ id", $group, 'list', 'persons', '', 'iframe', 'yes', "data-width='750'");?>
id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?>
id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?>
- id;?>
+ id;?>
name;?>
arrow . $lang->group->edit;?>
diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php
index 5848d5a63a..9cd4733f7c 100644
--- a/module/group/view/managemember.html.php
+++ b/module/group/view/managemember.html.php
@@ -14,12 +14,12 @@
- id;?>
+ id;?>
name;?>
-
+
icons['company']);?> dept->common;?>
diff --git a/module/testtask/css/cases.css b/module/testtask/css/cases.css
index b3bcb1b041..f940a61cc4 100644
--- a/module/testtask/css/cases.css
+++ b/module/testtask/css/cases.css
@@ -9,5 +9,3 @@ tbody > tr > td .icon-bug {margin-left: -8px;}
.table-footer .table-actions .input-group #assignedTo_chosen .chosen-single{height:28px;padding:3px 6px}
.table-footer .table-actions .input-group #assignedTo_chosen .chosen-single span{font-size:12px;}
.table-footer .table-actions .input-group #assignedTo_chosen .chosen-single div{line-height:10px;}
-
-#pageActions {top: -60px;}
diff --git a/module/testtask/js/cases.js b/module/testtask/js/cases.js
index 63155a80fc..79e00ac5ba 100644
--- a/module/testtask/js/cases.js
+++ b/module/testtask/js/cases.js
@@ -1,6 +1,5 @@
$(document).ready(function()
{
- setModal4List('runCase', 'caseList', function(){$(".iframe").modalTrigger({width:1024, type:'iframe'});}, 1024);
if(browseType == 'bysearch') ajaxGetSearchForm();
if($('#caseList thead th.w-title').width() < 150) $('#caseList thead th.w-title').width(150);
});
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 4aae515909..6cbe2fa05d 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -28,7 +28,7 @@ class testtaskModel extends model
if($testtask)
{
- $testtasks = $this->getProductTasks($productID, $branch, 'id_desc', null, array('local', 'totalStatus'));
+ $testtasks = $this->getProductTasks($productID, 0, 'id_desc', null, array('local', 'totalStatus'));
$selectHtml .= " ";
$selectHtml .= " ";
@@ -38,6 +38,10 @@ class testtaskModel extends model
$selectHtml .= "";
$selectHtml .= " ";
$selectHtml .= " ";
+
+ $this->lang->modulePageActions = '';
+ if(common::hasPriv('testtask', 'view')) $this->lang->modulePageActions .= html::a(helper::createLink('testtask', 'view', "taskID={$testtask->id}"), " " . $this->lang->testtask->view, '', "class='btn'");
+ if(common::hasPriv('testreport', 'browse')) $this->lang->modulePageActions .= html::a(helper::createLink('testreport', 'browse', "objectID=$productID&objectType=product&extra={$testtask->id}"), " " . $this->lang->testtask->reportField, '', "class='btn'");
}
$this->app->loadLang('qa');
diff --git a/module/testtask/view/caseheader.html.php b/module/testtask/view/caseheader.html.php
index 6ea5cd821e..2c08a2fd11 100644
--- a/module/testtask/view/caseheader.html.php
+++ b/module/testtask/view/caseheader.html.php
@@ -1,7 +1,3 @@
-
- " . $lang->testtask->view, '', "class='btn'");?>
- " . $lang->testtask->reportField, '', "class='btn'");?>
-
|