-
-
cookie->browseType == 'bygrid'):?>
From 8b77b8cd4bbf0c69f693b7da472ff1e61b4ef381 Mon Sep 17 00:00:00 2001
From: yfl <554665488@qq.com>
Date: Fri, 12 Apr 2019 10:23:59 +0800
Subject: [PATCH 7/9] * task #7860
---
module/user/model.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/module/user/model.php b/module/user/model.php
index db604120af..fd646117f7 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1433,7 +1433,7 @@ class userModel extends model
public function checkProductPriv($product, $account, $groups, $linkedProjects, $teams)
{
if(strpos($this->app->company->admins, ',' . $account . ',') !== false) return true;
- if($product->PO == $account OR $product->QD == $account OR $product->RD == $account OR $product->createdBy == $account) return true;
+ if($product->PO == $account OR $product->QD == $account OR $product->RD == $account OR $product->createdBy == $account OR $product->feedback == $account) return true;
if($product->acl == 'open') return true;
if($product->acl == 'custom')
From 2b922b2a3152576118be8f125315519b6e974a83 Mon Sep 17 00:00:00 2001
From: yfl <554665488@qq.com>
Date: Fri, 12 Apr 2019 13:59:36 +0800
Subject: [PATCH 8/9] * Task #7859
---
framework/control.class.php | 13 ++++++++++++-
module/misc/control.php | 4 ++++
module/misc/lang/zh-cn.php | 2 ++
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/framework/control.class.php b/framework/control.class.php
index f7b7adf73f..7d90e848c1 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -58,7 +58,18 @@ class control extends baseControl
$viewFile = file_exists($commonExtViewFile) ? $commonExtViewFile : $mainViewFile;
$viewFile = (!empty($siteExtViewFile) and file_exists($siteExtViewFile)) ? $siteExtViewFile : $viewFile;
- if(!is_file($viewFile)) $this->app->triggerError("the view file $viewFile not found", __FILE__, __LINE__, $exit = true);
+ if(!is_file($viewFile))
+ {
+ if($this->config->debug === false)
+ {
+ die(js::locate($this->createLink('misc','ajaxerror', ".mhtml"), 'parent'));
+ }
+ else
+ {
+ $this->app->triggerError("the view file $viewFile not found", __FILE__, __LINE__, $exit = true);
+ }
+
+ }
$commonExtHookFiles = glob($viewExtPath['common'] . $this->devicePrefix . $methodName . ".*.{$viewType}.hook.php");
$siteExtHookFiles = empty($viewExtPath['site']) ? '' : glob($viewExtPath['site'] . $this->devicePrefix . $methodName . ".*.{$viewType}.hook.php");
diff --git a/module/misc/control.php b/module/misc/control.php
index ec78640a24..20c81ded6c 100644
--- a/module/misc/control.php
+++ b/module/misc/control.php
@@ -193,4 +193,8 @@ class misc extends control
$this->view->detailed = $detailed;
$this->display();
}
+ public function ajaxerror()
+ {
+ $this->display();
+ }
}
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index a79da9eb40..ca4b7876e4 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -173,3 +173,5 @@ $lang->misc->feature->all['7.1.stable'][] = array('title'=>'提供rpm和deb包',
$lang->misc->feature->all['6.3.stable'][] = array('title'=>'增加数据表格功能', 'desc' => '
可配置数据表格中可显示的字段，按照配置字段显示想看的数据
'); $lang->misc->feature->all['6.3.stable'][] = array('title'=>'继续完善细节', 'desc' => ''); + +$lang->misc->error = '此功能正在努力开发中...'; From bfcb9f536a291e8b0f23a65452acaa9b84718e4b Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 12 Apr 2019 14:37:27 +0800 Subject: [PATCH 9/9] * Fix locate after create todo. --- module/todo/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/todo/control.php b/module/todo/control.php index c902d01c65..5eee51a94e 100644 --- a/module/todo/control.php +++ b/module/todo/control.php @@ -64,7 +64,7 @@ class todo extends control if($this->app->getViewType() == 'xhtml') die(js::locate($this->createLink('todo', 'view', "todoID=$todoID"), 'parent')); if(isonlybody()) die(js::locate($this->createLink('my', 'todo', "type=$date"), 'parent.parent')); - die(js::locate($this->createLink('my', 'todo', "type=$date"), 'parent')); + die(js::locate($this->createLink('my', 'todo', "type=all"), 'parent')); } unset($this->lang->todo->typeList['cycle']);