diff --git a/module/tree/model.php b/module/tree/model.php index 11d3a78309..d32ec30080 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -636,7 +636,7 @@ class treeModel extends model } else { - if(common::hasPriv('tree', 'edit')) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'edit', "module={$module->id}&type=$type"), $this->lang->tree->edit, '', 'data-toggle="modal" data-type="iframe" data-width="500"'); + if(common::hasPriv('tree', 'edit')) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'edit', "module={$module->id}&type=$type"), $this->lang->tree->edit, '', 'data-toggle="modal" data-type="ajax" data-width="500"'); if(common::hasPriv('tree', 'browse') and strpos($this->config->tree->noBrowse, ",$module->type,") === false) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'browse', "root={$module->root}&type=$type&module={$module->id}"), $this->lang->tree->child); if(common::hasPriv('tree', 'delete')) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'delete', "root={$module->root}&module={$module->id}"), $this->lang->delete, 'hiddenwin'); if(common::hasPriv('tree', 'updateorder')) $linkHtml .= ' ' . html::input("orders[$module->id]", $module->order, 'class="text-center w-30px form-control inline input-sm"'); diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php index 6c2b5617df..862351aad8 100644 --- a/module/tree/view/edit.html.php +++ b/module/tree/view/edit.html.php @@ -10,10 +10,9 @@ * @link http://www.zentao.net */ ?> - app->getWebRoot(); -$jsRoot = $webRoot . "js/"; +$webRoot = $this->app->getWebRoot(); +$jsRoot = $webRoot . "js/"; ?> -
+ type == 'story');?> > @@ -50,4 +49,3 @@ $jsRoot = $webRoot . "js/"; -