Merge branch 'master' of github.com:easysoft/zentaopms

module/doc/control.php

@@ -375,7 +375,10 @@ class doc extends control
         /* Get doc. */
         $doc = $this->doc->getById($docID, true);
         if(!$doc) die(js::error($this->lang->notFound) . js::locate('back'));
-        if($doc->project != 0 and !$this->project->checkPriv($this->project->getById($doc->project)))
+
+        /* Check priv when lib is product or project. */
+        $systemLib = ($doc->lib == 'project' or $doc->lib == 'product') ? $doc->lib : '';
+        if($systemLib and !$this->{$systemLib}->checkPriv($this->{$systemLib}->getById($doc->{$systemLib})))
         {
             echo(js::alert($this->lang->error->accessDenied));
             die(js::locate('back'));

module/project/view/task.html.php

@@ -16,9 +16,7 @@
 <?php include './taskheader.html.php';?>
 <?php js::set('moduleID', $moduleID);?>
 <?php js::set('productID', $productID);?>
-<script language='Javascript'>
-var browseType  = '<?php echo $browseType;?>';
-</script>
+<?php js::set('browseType', $browseType);?>
 
 <div class='side' id='taskTree'>
   <a class='side-handle' data-id='storyTree'><i class='icon-caret-left'></i></a>