Merge branch 'master' of https://git.zcorp.cc/zentaopms

module/index/view/index.html.php

@@ -49,7 +49,8 @@ js::set('defaultOpen', $open);
       <?php if(isset($config->xxserver->installed) and $config->xuanxuan->turnon) commonModel::printClientLink();?>
       <?php echo $lang->proVersion;?>
       <a href='<?php echo $lang->website;?>' class="btn btn-sm btn-link" target='_blank' title='<?php echo $config->version;?>'><i class="icon icon-zentao" style="font-size: 24px;"></i></a>
-      <!--<a href='javascript:void(0)' class="btn btn-sm btn-link" type="button"><i class="icon icon-message"></i></a>-->
+      <!--
+      <a href='javascript:void(0)' class="btn btn-sm btn-link" type="button"><i class="icon icon-message"></i></a>
       <div id="globalSearchDiv">
         <div class="input-group">
           <div class="input-control search-box search-box-circle has-icon-left has-icon-right search-example" id="searchboxExample">
@@ -60,6 +61,7 @@ js::set('defaultOpen', $open);
           </span>
         </div>
       </div>
+      -->
     </div>
   </div>
 </div>

module/productplan/view/linkbug.html.php

@@ -59,7 +59,7 @@
       <?php if($unlinkedCount):?>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar">
-        <?php echo html::submitButton($lang->productplan->linkBug, '', 'btn btn-secondary');?>
+        <?php echo html::submitButton($lang->productplan->linkBug, '', 'btn');?>
       </div>
       <?php endif;?>
       <div class="btn-toolbar">

module/productplan/view/linkstory.html.php

@@ -72,7 +72,7 @@
       <?php if($unlinkedCount):?>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar">
-        <?php echo html::submitButton($lang->productplan->linkStory, '', 'btn btn-secondary');?>
+        <?php echo html::submitButton($lang->productplan->linkStory, '', 'btn');?>
       </div>
       <?php endif;?>
       <div class="btn-toolbar">

module/program/model.php

@@ -387,8 +387,8 @@ class programModel extends model
         $query = $this->dao->select('*')->from(TABLE_PROJECT)
             ->where('deleted')->eq('0')
             ->beginIF($from == 'program')
-            ->andWhere('type')->in('program,project')
-            ->andWhere('id')->in($this->app->user->view->programs . ',' . $this->app->user->view->projects)
+            ->andWhere('type')->eq('program')
+            ->andWhere('id')->in($this->app->user->view->programs)
             ->fi()
             ->beginIF($from == 'product')
             ->andWhere('type')->eq('program')