From d4944de830a8c62770592cbefab78667ea19ddd8 Mon Sep 17 00:00:00 2001 From: "chencongzhi520@gmail.com" Date: Fri, 5 Jul 2013 07:13:12 +0000 Subject: [PATCH] * code for dropMenu. --- module/common/lang/en.php | 2 - module/common/lang/zh-cn.php | 2 - module/product/lang/zh-cn.php | 2 +- module/product/model.php | 1 - module/project/lang/zh-cn.php | 2 +- module/project/model.php | 9 +--- www/js/my.full.js | 79 ----------------------------------- 7 files changed, 3 insertions(+), 94 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 2f34eadcaa..515d4d62bb 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -60,8 +60,6 @@ $lang->fold = '-'; $lang->selectAll = 'All'; $lang->selectReverse = 'Inverse'; $lang->notFound = 'Sorry, the object not found.'; -$lang->showAll = '[[Show all projects]]'; -$lang->hideClosed = '[[Show projects going]]'; $lang->future = 'Future'; $lang->year = 'Year'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 577a360889..eb9b8bc0a7 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -60,8 +60,6 @@ $lang->fold = '-'; $lang->selectAll = '全选'; $lang->selectReverse = '反选'; $lang->notFound = '抱歉，您访问的对象并不存在！'; -$lang->showAll = '[[全部显示]]'; -$lang->hideClosed = '[[显示进行中]]'; $lang->future = '未来'; $lang->year = '年'; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 19172f7ae9..a077a6e26b 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -87,4 +87,4 @@ $lang->product->aclList['private'] = '私有产品(只有项目团队成员才 $lang->product->aclList['custom'] = '自定义白名单(团队成员和白名单的成员可以访问)'; $lang->product->storySummary = "本页共 %s 个需求，预计 %s 个工时。"; -$lang->product->noMatchedProduct = '找不到与"%s"相关的产品'; +$lang->product->noMatchedProduct = '找不到包含"%s"的产品'; diff --git a/module/product/model.php b/module/product/model.php index 3e0b7d983f..61b8c753b4 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -145,7 +145,6 @@ class productModel extends model public function getPairs($mode = '') { $orderBy = !empty($this->config->product->orderBy) ? $this->config->product->orderBy : 'isClosed'; - $mode .= $this->cookie->productMode; $products = $this->dao->select('*, IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed') ->from(TABLE_PRODUCT) ->where('deleted')->eq(0) diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index f3b608c83d..786e0b2f74 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -178,7 +178,7 @@ $lang->project->whyNoStories = "看起来没有需求可以关联。请检 $lang->project->doneProjects = '已结束'; $lang->project->unDoneProjects = '未结束'; $lang->project->copyTeam = '复制团队'; -$lang->product->noMatchedProject = '找不到与"%s"相关的项目'; +$lang->product->noMatchedProject = '找不到包含"%s"的项目'; /* 交互提示。*/ $lang->project->confirmDelete = '您确定删除项目[%s]吗？'; diff --git a/module/project/model.php b/module/project/model.php index be1c9b5fc6..e17adeeb92 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -89,12 +89,6 @@ class projectModel extends model $moduleName = $this->app->getModuleName(); $methodName = $this->app->getMethodName(); - if($this->cookie->projectMode == 'noclosed' and $project->status == 'done') - { - setcookie('projectMode', 'all'); - $this->cookie->projectMode = 'all'; - } - $selectHtml = $this->select($projects, $projectID, $moduleName, $methodName, $extra); foreach($this->lang->project->menu as $key => $menu) { @@ -439,8 +433,7 @@ class projectModel extends model */ public function getPairs($mode = '') { - $orderBy = !empty($this->config->project->orderBy) ? $this->config->project->orderBy : 'isDone, status'; - $mode .= $this->cookie->projectMode; + $orderBy = !empty($this->config->project->orderBy) ? $this->config->project->orderBy : 'isDone, status'; /* Order by status's content whether or not done */ $projects = $this->dao->select('*, IF(INSTR(" done", status) < 2, 0, 1) AS isDone')->from(TABLE_PROJECT) ->where('iscat')->eq(0) diff --git a/www/js/my.full.js b/www/js/my.full.js index a59a18c0ad..b7dc797bbf 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -103,26 +103,6 @@ function shortcut() } } -/** - * Set the product switcher - * - * @access public - * @return void - */ -function setProductSwitcher() -{ - productMode = $.cookie('productMode'); - if(!productMode) productMode = 'noclosed'; - if(productMode == 'all') - { - $("#productID").append($("")); - } - else - { - $("#productID").append($("")); - } -} - /** * Show drop menu. * @@ -227,63 +207,6 @@ function saveProduct() if($('#productID')) $.cookie('lastProduct', $('#productID').val(), {expires:config.cookieLife, path:config.webRoot}); } -/** - * Set project switcher - * - * @access public - * @return void - */ -function setProjectSwitcher() -{ - projectMode = $.cookie('projectMode'); - if(!projectMode) projectMode = 'noclosed'; - if(projectMode == 'all') - { - $("#projectID").append($("")); - } - else - { - $("#projectID").append($("")); - } -} - -/** - * Swtich project. - * - * @param int $projectID - * @param string $module - * @param string $method - * @access public - * @return void - */ -function switchProject(projectID, module, method, extra) -{ - /* The projec id is a string, use it as the project model. */ - if(isNaN(projectID)) - { - $.cookie('projectMode', projectID, {expires:config.cookieLife, path:config.webRoot}); - projectID = 0; - } - - /* Process task and build modules. */ - if(module == 'task' && (method == 'view' || method == 'edit' || method == 'batchedit')) - { - module = 'project'; - method = 'task'; - } - if(module == 'build' && method == 'edit') - { - module = 'project'; - method = 'build'; - } - - if(module == 'project' && method == 'create') return; - - link = createLink(module, method, 'projectID=' + projectID); - if(extra != '') link = createLink(module, method, 'projectID=' + projectID + '&type=' + extra); - location.href = link; -} - /** * Save the id of the project last visited. * @@ -881,8 +804,6 @@ $(document).ready(function() setRequiredFields(); setPlaceholder(); - setProductSwitcher(); - setProjectSwitcher(); saveProduct(); saveProject();