diff --git a/module/action/model.php b/module/action/model.php index f70bef05bf..40c55ee22d 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -917,6 +917,8 @@ class actionModel extends model ->beginIF($docs and !$this->app->user->admin)->andWhere("IF(objectType != 'doc' || (objectType = 'doc' && (action = 'approved' || action = 'removed')), '1=1', objectID " . helper::dbIN($docs) . ")")->fi() ->beginIF($libs and !$this->app->user->admin)->andWhere("IF(objectType != 'doclib', '1=1', objectID " . helper::dbIN(array_keys($libs)) . ') ')->fi() ->beginIF($actionCondition)->andWhere("($actionCondition)")->fi() + /* Filter out client login/logout actions. */ + ->andWhere('action')->notin('disconnectxuanxuan,loginxuanxuan') ->orderBy($orderBy) ->page($pager) ->fetchAll(); @@ -1008,13 +1010,13 @@ class actionModel extends model $actionQuery = str_replace("`product` = '$productID'", "`product` LIKE '%,$productID,%'", $actionQuery); if($date) $actionQuery = "($actionQuery) AND " . ('date' . ($direction == 'next' ? '<' : '>') . "'{$date}'"); - + /* If this vision is lite, delete product actions. */ if($this->config->vision == 'lite') $actionQuery .= " AND objectType != 'product'"; - + $actionQuery .= " AND vision = '" . $this->config->vision . "'"; $actions = $this->getBySQL($actionQuery, $orderBy, $pager); - + $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'action'); if(!$actions) return array(); return $this->transformActions($actions); diff --git a/module/common/model.php b/module/common/model.php index 6b81d3bd1e..ae8e9c57c7 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -413,7 +413,7 @@ class commonModel extends model { if(!commonModel::isTutorialMode()) { - echo '
  • ' . html::a(helper::createLink('tutorial', 'start'), " " . $lang->tutorialAB, '', "class='iframe' data-class-name='modal-inverse' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . '
  • '; + echo '
  • ' . html::a(helper::createLink('tutorial', 'start'), " " . $lang->tutorialAB, '', "class='iframe' data-class-name='modal-inverse' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . '
  • '; } echo '
  • ' . html::a(helper::createLink('my', 'preference', '', '', true), " " . $lang->preference, '', "class='iframe' data-width='700'") . '
  • '; diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index c0e95a884d..e294df8a85 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -48,6 +48,10 @@ include 'chosen.html.php';
    sso->redirect)) echo "class='ranzhiFixedTfootAction'";?> >
    diff --git a/module/common/view/header.lite.html.php b/module/common/view/header.lite.html.php index 0f5771a23c..807b39b71c 100755 --- a/module/common/view/header.lite.html.php +++ b/module/common/view/header.lite.html.php @@ -77,6 +77,8 @@ if($this->config->vision == 'lite') $extHookFiles = glob($extHookRule); if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile; } +$xuanExtFile = $extensionRoot . 'xuan/common/ext/view/header.xuanxuan.html.hook.php'; +if(file_exists($xuanExtFile)) include $xuanExtFile; ?> app->getViewType() == 'xhtml' ? 'allow-self-open' : '';?> diff --git a/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php b/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php index b612a25dfc..af63fb354a 100644 --- a/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php +++ b/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php @@ -136,7 +136,7 @@ goback, '', 'class="btn" style="min-width: 120px"');?> xuanxuan->turnon ? '' : 'disabled';?> - im->downloadXXD, 'hiddenwin', "class='btn btn-primary download download-package $disabled'");?> + im->downloadXXD, 'hiddenwin', "class='btn btn-primary download download-package $disabled'");?> im->downloadConfig, 'hiddenwin', "class='btn btn-primary download $disabled'");?> im->changeSetting, '', "class='btn'");?> im->viewDebug, '', "class='btn viewDebug iframe' data-height=220");?>