diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 38d2b32d7c..92ba0fc981 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -18,7 +18,7 @@ * @copyright Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com) * @author Chunsheng Wang * @package bug - * @version $Id: zh-tw.php 947 2010-07-14 10:09:33Z yuren_@126.com $ + * @version $Id: zh-tw.php 972 2010-07-28 06:14:58Z wwccss $ * @link http://www.zentaoms.com */ /* 欄位列表。*/ @@ -37,6 +37,7 @@ $lang->bug->severityAB = '級別'; $lang->bug->pri = '優先順序'; $lang->bug->type = 'Bug類型'; $lang->bug->os = '操作系統'; +$lang->bug->hardware = '硬件平台'; $lang->bug->browser = '瀏覽器'; $lang->bug->machine = '機器硬件'; $lang->bug->found = '如何發現'; @@ -77,6 +78,8 @@ $lang->bug->close = '關閉Bug'; $lang->bug->activate = '激活Bug'; $lang->bug->reportChart = '報表統計'; $lang->bug->delete = '刪除Bug'; +$lang->bug->customFields = '自定義欄位'; +$lang->bug->restoreDefault = '恢復預設'; $lang->bug->ajaxGetUserBugs = '介面:我的Bug'; $lang->bug->confirmStoryChange = '確認需求變動'; @@ -105,6 +108,8 @@ $lang->bug->lblAssignedTo = '當前指派'; $lang->bug->lblMailto = '抄送給'; $lang->bug->lblLastEdited = '最後修改'; $lang->bug->lblResolved = '由誰解決'; +$lang->bug->lblAllFields = '所有欄位'; +$lang->bug->lblCustomFields = '自定義欄位'; /* legend列表。*/ $lang->bug->legendBasicInfo = '基本信息'; @@ -131,6 +136,7 @@ $lang->bug->buttonToList = '返回'; /* 交互提示。*/ $lang->bug->confirmChangeProduct = '修改產品會導致相應的項目、需求和任務發生變化，確定嗎？'; $lang->bug->confirmDelete = '您確認要刪除該Bug嗎？'; +$lang->bug->setTemplateTitle = '請輸入bug模板標題（保存之前請先填寫bug重現步驟）：'; /* 模板。*/ $lang->bug->tblStep = "[步驟]\n"; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index e12e13a63c..c7ab7b62f3 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -20,7 +20,7 @@ * @copyright Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com) * @author Chunsheng Wang * @package ZenTaoMS - * @version $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $ + * @version $Id: zh-tw.php 988 2010-07-31 07:14:46Z wwccss $ * @link http://www.zentaoms.com */ $lang->arrow = ' » '; @@ -85,6 +85,8 @@ $lang->menu->my = '我的地盤|my|index'; $lang->menu->product = '產品視圖|product|index'; $lang->menu->project = '項目視圖|project|index'; $lang->menu->qa = 'QA視圖|qa|index'; +$lang->menu->doc = '文檔視圖|doc|index'; +//$lang->menu->forum = '討論視圖|doc|index'; $lang->menu->company = '組織視圖|company|index'; $lang->menu->admin = '後台管理|admin|index'; @@ -122,9 +124,10 @@ $lang->product->menu->story = array('link' => '需求列表|product|browse|prod $lang->product->menu->plan = array('link' => '計劃列表|productplan|browse|productID=%s', 'subModule' => 'productplan'); $lang->product->menu->release= array('link' => '發佈列表|release|browse|productID=%s', 'subModule' => 'release'); $lang->product->menu->roadmap= '路線圖|product|roadmap|productID=%s'; +$lang->product->menu->doc = '文檔列表|product|doc|productID=%s'; $lang->product->menu->view = '基本信息|product|view|productID=%s'; $lang->product->menu->edit = '編輯產品|product|edit|productID=%s'; -$lang->product->menu->module = '維護模組|tree|browse|productID=%s&view=product'; +$lang->product->menu->module = '維護模組|tree|browse|productID=%s&view=story'; $lang->product->menu->delete = array('link' => '刪除產品|product|delete|productID=%s', 'target' => 'hiddenwin'); $lang->product->menu->create = array('link' => '新增產品|product|create', 'float' => 'right'); $lang->story->menu = $lang->product->menu; @@ -139,6 +142,7 @@ $lang->project->menu->bug = 'Bug列表|project|bug|projectID=%s'; $lang->project->menu->build = array('link' => 'Build列表|project|build|projectID=%s', 'subModule' => 'build'); $lang->project->menu->burn = '燃盡圖|project|burn|projectID=%s'; $lang->project->menu->team = array('link' => '團隊成員|project|team|projectID=%s', 'alias' => 'managemembers'); +$lang->project->menu->doc = '文檔列表|project|doc|porjectID=%s'; $lang->project->menu->product = '關聯產品|project|manageproducts|projectID=%s'; $lang->project->menu->linkstory = array('link' => '關聯需求|project|linkstory|projectID=%s'); $lang->project->menu->view = '基本信息|project|view|projectID=%s'; @@ -165,6 +169,14 @@ $lang->testtask->menu->bug = array('link' => '缺陷管理|bug|browse|produ $lang->testtask->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s'); $lang->testtask->menu->testtask = array('link' => '測試任務|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases'); +/* 文檔視圖菜單設置。*/ +$lang->doc->menu->list = '%s'; +$lang->doc->menu->browse = array('link' => '文檔列表|doc|browse|libID=%s'); +$lang->doc->menu->edit = '編輯文檔庫|doc|editLib|libID=%s'; +$lang->doc->menu->module = '維護模組|tree|browse|libID=%s&viewType=doc'; +$lang->doc->menu->delete = array('link' => '刪除文檔庫|doc|deleteLib|libID=%s', 'target' => 'hiddenwin'); +$lang->doc->menu->create = array('link' => '新增文檔庫|doc|createLib', 'float' => 'right'); + /* 組織結構視圖菜單設置。*/ $lang->company->menu->name = '%s' . $lang->arrow; $lang->company->menu->browseUser = array('link' => '用戶列表|company|browse', 'subModule' => 'user'); @@ -251,3 +263,37 @@ define('DT_DATE2', 'Ymd'); define('DT_DATE3', 'Y年m月d日'); define('DT_TIME1', 'H:i:s'); define('DT_TIME2', 'H:i'); + +/* 表情。*/ +$lang->smilies->smile = '微笑'; +$lang->smilies->sad = '悲傷'; +$lang->smilies->wink = '眨眼'; +$lang->smilies->tongue = '吐舌頭'; +$lang->smilies->shocked = '驚訝'; +$lang->smilies->eyesdown = '失望'; +$lang->smilies->angry = '憤怒'; +$lang->smilies->cool = '耍酷'; +$lang->smilies->indifferent = '冷漠'; +$lang->smilies->sick = '病中'; +$lang->smilies->blush = '尷尬'; +$lang->smilies->angel = '天使'; +$lang->smilies->confused = '困惑'; +$lang->smilies->cry = '大哭'; +$lang->smilies->footinmouth = '保密'; +$lang->smilies->biggrin = '大笑'; +$lang->smilies->nerd = '書獃子'; +$lang->smilies->tired = '好累'; +$lang->smilies->rose = '玫瑰'; +$lang->smilies->kiss = '吻'; +$lang->smilies->heart = '心'; +$lang->smilies->hug = '擁抱'; +$lang->smilies->dog = '狗狗'; +$lang->smilies->deadrose = '殘花'; +$lang->smilies->clock = '時鐘'; +$lang->smilies->brokenheart = '傷心'; +$lang->smilies->coffee = '咖啡'; +$lang->smilies->computer = '計算機'; +$lang->smilies->devil = '魔鬼'; +$lang->smilies->thumbsup = '贊同'; +$lang->smilies->thumbsdown = '反對'; +$lang->smilies->mail = '郵件'; diff --git a/module/doc/config.php b/module/doc/config.php index dc07369ba4..4b1acd503b 100644 --- a/module/doc/config.php +++ b/module/doc/config.php @@ -1,3 +1,5 @@ doc->createLib->requiredFields = 'name'; $config->doc->editLib->requiredFields = 'name'; +$config->doc->create->requiredFields = 'title'; +$config->doc->edit->requiredFields = 'title'; diff --git a/module/doc/control.php b/module/doc/control.php index e30443d757..73de420d51 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -26,6 +26,9 @@ class doc extends control public function __construct() { parent::__construct(); + $this->loadModel('user'); + $this->loadModel('tree'); + $this->loadModel('action'); $this->libs = $this->doc->getLibs(); } @@ -37,7 +40,6 @@ class doc extends control /* 浏览某一个产品。*/ public function browse($libID = 'product', $moduleID = 0, $productID = 0, $projectID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { - $this->loadModel('tree'); $this->doc->setMenu($this->libs, $libID, 'doc'); $this->session->set('docList', $this->app->getURI(true)); @@ -73,6 +75,8 @@ class doc extends control $this->view->pager = $pager; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->orderBy = $orderBy; + $this->view->productID = $productID; + $this->view->projectID = $projectID; $this->display(); } @@ -125,7 +129,66 @@ class doc extends control //$this->session->set('doc', ''); // 清除session。 die(js::locate($this->createLink('doc', 'browse'), 'parent')); } + } + + /* 创建文档。extras是其他的参数，key和value之间使用=连接，多个键值对之间使用,隔开。*/ + public function create($libID, $moduleID = 0, $productID = 0, $projectID = 0) + { + //if(empty($this->libs)) $this->locate($this->createLink('doc', 'createLib')); + if(!empty($_POST)) + { + $docID = $this->doc->create(); + if(dao::isError()) die(js::error(dao::getError())); + $actionID = $this->action->create('doc', $docID, 'Created'); + $extra = ($productID > 0) ? "&productID=$productID" : ''; + $extra .= ($projectID > 0) ? "&projectID=$projectID" : ''; + $link = "libID=$libID&module=$moduleID" . $extra; + die(js::locate($this->createLink('doc', 'browse', $link), 'parent')); + } + + /* 设置当前的文档库，设置菜单。*/ + //$docID = common::saveDocState($docID, key($this->libs)); + $this->doc->setMenu($this->libs, $libID, 'doc'); + + /* 初始化变量。*/ + $title = ''; + //$type = ''; + //$digest = ''; + //$content = ''; + //$keywords = ''; + //$url = 'http://'; + //views = ''; + + /* 获得子模块列表。*/ + if($libID == 'product' or $libID == 'project') + { + $moduleOptionMenu = $this->tree->getOptionMenu(0, $libID . 'doc', $startModuleID = 0); + } + else + { + $moduleOptionMenu = $this->tree->getOptionMenu($libID, 'customdoc', $startModuleID = 0); + } + + /* 位置信息。*/ + $this->view->header->title = $this->libs[$libID] . $this->lang->colon . $this->lang->doc->create; + $this->view->position[] = html::a($this->createLink('doc', 'browse', "libID=$libID"), $this->libs[$libID]); + $this->view->position[] = $this->lang->doc->create; + + $this->view->libID = $libID; + $this->view->users = $this->user->getPairs('noclosed,nodeleted'); + $this->view->title = $title; + $this->view->moduleOptionMenu = $moduleOptionMenu; + $this->view->moduleID = $moduleID; + $this->view->productID = $productID; + $this->view->projectID = $projectID; + //$this->view->type = $type; + //$this->view->digest = $digest; + //$this->view->content = $content; + //$this->view->keywords = $keywords; + //$this->view->url = $url; + //$this->view->views = $views; + $this->display(); } } diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 83a08647b4..32d74b97dd 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -32,7 +32,9 @@ $lang->doc->title = '文档标题'; $lang->doc->digest = '文档摘要'; $lang->doc->type = '文档类型'; $lang->doc->content = '文档正文'; +$lang->doc->keywords = '关键字'; $lang->doc->url = '文档URL'; +$lang->doc->files = '附件'; $lang->doc->views = '查阅次数'; $lang->doc->addedBy = '由谁添加'; $lang->doc->addedDate = '添加时间'; diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php new file mode 100644 index 0000000000..203f1c4458 --- /dev/null +++ b/module/doc/lang/zh-tw.php @@ -0,0 +1,60 @@ +. + * + * @copyright Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com) + * @author Chunsheng Wang + * @package doc + * @version $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $ + * @link http://www.zentaoms.com + */ +/* 欄位列表。*/ +$lang->doc->common = '缺陷管理'; +$lang->doc->id = '文檔編號'; +$lang->doc->product = '所屬產品'; +$lang->doc->product = '所屬項目'; +$lang->doc->lib = '所屬文檔庫'; +$lang->doc->module = '所屬分類'; +$lang->doc->title = '文檔標題'; +$lang->doc->digest = '文檔摘要'; +$lang->doc->type = '文檔類型'; +$lang->doc->content = '文檔正文'; +$lang->doc->keywords = '關鍵字'; +$lang->doc->url = '文檔URL'; +$lang->doc->files = '附件'; +$lang->doc->views = '查閲次數'; +$lang->doc->addedBy = '由誰添加'; +$lang->doc->addedDate = '添加時間'; +$lang->doc->editedBy = '由誰編輯'; +$lang->doc->editedDate = '編輯時間'; + +$lang->doc->moduleName = '模組名稱'; +$lang->doc->moduleOrder = '模組排序'; + +/* 方法列表。*/ +$lang->doc->index = '首頁'; +$lang->doc->create = '創建文檔'; +$lang->doc->edit = '編輯文檔'; +$lang->doc->browse = '文檔列表'; +$lang->doc->view = '文檔詳情'; +$lang->doc->createLib = '創建文檔庫'; +$lang->doc->editLib = '編輯文檔庫'; +$lang->doc->libName = '文檔庫名稱'; + +$lang->doc->systemLibs['product'] = '產品文檔庫'; +$lang->doc->systemLibs['project'] = '項目文檔庫'; + +$lang->doc->confirmDeleteLib = " 您確定刪除該文檔庫嗎？"; diff --git a/module/doc/model.php b/module/doc/model.php index 2e4a481713..da8f48b6c3 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -101,6 +101,33 @@ class docModel extends model ->fetchAll(); } + /* 创建一个文档。*/ + public function create() + { + $now = helper::now(); + $doc = fixer::input('post') + ->add('addedBy', $this->app->user->account) + ->add('addedDate', $now) + ->setDefault('product, project', 0) + ->specialChars('title, module') //type, digest, content, keyword + ->cleanInt('product, project') + ->remove('files, labels') + ->get(); + $this->dao->insert(TABLE_DOC) + ->data($doc) + ->autoCheck() + ->batchCheck($this->config->doc->create->requiredFields, 'notempty') + ->check('title', 'unique') + ->exec(); + if(!dao::isError()) + { + $docID = $this->dao->lastInsertID(); + $this->loadModel('file')->saveUpload('doc', $docID); + return $docID; + } + return false; + } + /* 获得某一个产品的文档列表。*/ public function getProductDocs($productID) { diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index 5b75bad90e..0399354b8c 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -36,7 +36,12 @@ $(document).ready(function()
- createLink('doc', 'create', "libID=$libID&moduleID=$moduleID"), $lang->doc->create); ?> + 0) ? "&productID=$productID" : ''; + $extra .= ($projectID > 0) ? "&projectID=$projectID" : ''; + $link = "libID=$libID&moduleID=$moduleID" . $extra; + echo html::a($this->createLink('doc', 'create', $link), $lang->doc->create); + ?>
diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php new file mode 100644 index 0000000000..ddc6f0f366 --- /dev/null +++ b/module/doc/view/create.html.php @@ -0,0 +1,79 @@ +. + * + * @copyright Copyright 2009-2010 青岛易软天创网络科技有限公司(www.cnezsoft.com) + * @author Jia Fu + * @package doc + * @version $Id: create.html.php 975 2010-07-29 03:30:25Z jajacn@126.com $ + * @link http://www.zentaoms.com + */ +?> + + +
+
+ + + + + + + + + + + + + + + + + + +
doc->create;?>
doc->module;?>
doc->title;?>
doc->files;?>fetch('file', 'buildform', 'fileCount=2');?>
+ + +
+
+
+ diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php index de5bbef802..6a953ae1b8 100644 --- a/module/product/lang/zh-tw.php +++ b/module/product/lang/zh-tw.php @@ -18,7 +18,7 @@ * @copyright Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com) * @author Chunsheng Wang * @package product - * @version $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $ + * @version $Id: zh-tw.php 988 2010-07-31 07:14:46Z wwccss $ * @link http://www.zentaoms.com */ $lang->product->common = '產品視圖'; @@ -32,6 +32,7 @@ $lang->product->edit = "編輯產品"; $lang->product->delete = "刪除產品"; $lang->product->roadmap = '路線圖'; +$lang->product->doc = '文檔列表'; $lang->product->selectProduct = "請選擇產品"; $lang->product->saveButton = " 保存 (S) "; @@ -42,14 +43,18 @@ $lang->product->ajaxGetPlans = "介面:計劃列表"; $lang->product->errorFormat = '產品數據格式不正確'; $lang->product->errorEmptyName = '產品名稱不能為空'; $lang->product->errorEmptyCode = '產品代號不能為空'; +$lang->product->accessDenied = '您無權訪問該產品'; -$lang->product->id = '編號'; -$lang->product->company = '所屬公司'; -$lang->product->name = '產品名稱'; -$lang->product->code = '產品代號'; -$lang->product->order = '排序'; -$lang->product->status = '狀態'; -$lang->product->desc = '產品描述'; +$lang->product->id = '編號'; +$lang->product->company = '所屬公司'; +$lang->product->name = '產品名稱'; +$lang->product->code = '產品代號'; +$lang->product->order = '排序'; +$lang->product->status = '狀態'; +$lang->product->desc = '產品描述'; +$lang->product->bugOwner = 'Bug負責人'; +$lang->product->acl = '訪問控制'; +$lang->product->whitelist = '分組白名單'; $lang->product->moduleStory = '按模組瀏覽'; $lang->product->searchStory = '搜索'; @@ -58,3 +63,7 @@ $lang->product->allStory = '全部需求'; $lang->product->statusList[''] = ''; $lang->product->statusList['normal'] = '正常'; $lang->product->statusList['closed'] = '結束'; + +$lang->product->aclList['open'] = '預設設置(有產品視圖權限，即可訪問)'; +$lang->product->aclList['private'] = '私有項目(只有項目團隊成員才能訪問)'; +$lang->product->aclList['custom'] = '自定義白名單(團隊成員和白名單的成員可以訪問)'; diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index 391ddab8f2..634aa7f851 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -18,7 +18,7 @@ * @copyright Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com) * @author Chunsheng Wang * @package project - * @version $Id: zh-tw.php 902 2010-07-04 06:25:03Z wwccss $ + * @version $Id: zh-tw.php 988 2010-07-31 07:14:46Z wwccss $ * @link http://www.zentaoms.com */ /* 欄位列表。*/ @@ -78,6 +78,7 @@ $lang->project->burn = '燃盡圖'; $lang->project->computeBurn = '更新燃盡圖'; $lang->project->burnData = '燃盡圖數據'; $lang->project->team = '團隊成員'; +$lang->project->doc = '文檔列表'; $lang->project->manageProducts = '關聯產品'; $lang->project->linkStory = '關聯需求'; $lang->project->view = "基本信息"; diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php index 86ea5bbe58..2f15687e38 100644 --- a/module/tree/lang/zh-tw.php +++ b/module/tree/lang/zh-tw.php @@ -18,27 +18,32 @@ * @copyright Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com) * @author Chunsheng Wang * @package tree - * @version $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $ + * @version $Id: zh-tw.php 986 2010-07-31 02:53:32Z wwccss $ * @link http://www.zentaoms.com */ -$lang->tree->common = '模組維護'; -$lang->tree->add = "添加"; -$lang->tree->edit = "編輯"; -$lang->tree->addChild = "添加子模組"; -$lang->tree->delete = "刪除模組"; -$lang->tree->browse = "模組維護"; -$lang->tree->manage = "維護模組"; -$lang->tree->manageProduct= "維護產品視圖模組"; -$lang->tree->manageProject= "維護項目視圖模組"; -$lang->tree->manageBug = "維護QA視圖模組"; -$lang->tree->manageCase = "維護用例視圖模組"; -$lang->tree->updateOrder = "更新排序"; -$lang->tree->manageChild = "維護子模組"; -$lang->tree->child = "子模組"; -$lang->tree->ajaxGetOptionMenu = "介面:獲取下拉列表"; +$lang->tree->common = '模組維護'; +$lang->tree->add = '添加'; +$lang->tree->edit = '編輯'; +$lang->tree->addChild = '添加子模組'; +$lang->tree->delete = '刪除模組'; +$lang->tree->browse = '模組維護'; +$lang->tree->manage = '維護模組'; +$lang->tree->manageProduct = '維護產品視圖模組'; +$lang->tree->manageProject = '維護項目視圖模組'; +$lang->tree->manageBug = '維護QA視圖模組'; +$lang->tree->manageCase = '維護用例視圖模組'; +$lang->tree->manageCustomDoc = '維護文檔庫模組'; +$lang->tree->updateOrder = '更新排序'; +$lang->tree->manageChild = '維護子模組'; +$lang->tree->syncFromProduct = '複製產品視圖模組'; +$lang->tree->ajaxGetOptionMenu = '介面:獲取下拉列表'; -$lang->tree->confirmDelete = "您確定刪除該模組嗎？"; -$lang->tree->successSave = "成功保存"; +$lang->tree->confirmDelete = '您確定刪除該模組嗎？'; +$lang->tree->successSave = '成功保存'; $lang->tree->name = '模組名稱'; $lang->tree->parent = '上級模組'; +$lang->tree->child = '子模組'; +$lang->tree->owner = '負責人'; +$lang->tree->order = '排序'; +$lang->tree->projectDoc = '項目文檔';