* adjust code.
This commit is contained in:
@@ -22,7 +22,7 @@ class dao extends baseDAO
|
||||
{
|
||||
public function exec($sql = '')
|
||||
{
|
||||
if(isset($_SESSION['tutorialMode']) and $_SESSION['tutorialMode']) die(js::alert($this->lang->error->tutorialData));
|
||||
if(isset($_SESSION['tutorialMode']) and $_SESSION['tutorialMode']) die();
|
||||
return parent::exec($sql);
|
||||
}
|
||||
|
||||
|
||||
+16
-1
@@ -2468,7 +2468,22 @@ class bugModel extends model
|
||||
break;
|
||||
case 'openedBuild':
|
||||
$builds = array_flip($builds);
|
||||
foreach(explode(',', $bug->openedBuild) as $build) echo html::a(helper::createLink('build', 'view', "buildID=$builds[$build]"), $build, '', "title='$bug->openedBuild'");
|
||||
foreach(explode(',', $bug->openedBuild) as $build)
|
||||
{
|
||||
$buildID = zget($builds, $build, '');
|
||||
if($buildID == 'trunk')
|
||||
{
|
||||
echo $build;
|
||||
}
|
||||
elseif($buildID and common::hasPriv('build', 'view'))
|
||||
{
|
||||
echo html::a(helper::createLink('build', 'view', "buildID=$buildID"), $build, '', "title='$bug->openedBuild'");
|
||||
}
|
||||
else
|
||||
{
|
||||
echo $build;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 'assignedTo':
|
||||
echo zget($users, $bug->assignedTo, $bug->assignedTo);
|
||||
|
||||
@@ -1162,6 +1162,7 @@ class commonModel extends model
|
||||
if($menu == 'my' or $menu == 'index' or $module == 'tree') return true;
|
||||
if($module == 'company' and $method == 'dynamic') return true;
|
||||
if($module == 'action' and $method == 'editcomment') return true;
|
||||
if($module == 'action' and $method == 'comment') return true;
|
||||
if(!isset($acls['views'][$menu])) return false;
|
||||
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user