diff --git a/module/bug/model.php b/module/bug/model.php index facb21345d..f7721b011c 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -1325,6 +1325,7 @@ class bugModel extends model $bugs = $this->dao->select('*')->from(TABLE_BUG) ->where('deleted')->eq(0) ->beginIF(!$this->app->user->admin)->andWhere('project')->in('0,' . $this->app->user->view->projects)->fi() + ->beginIF($type != 'closedBy')->andWhere('status')->ne('closed')->fi() ->beginIF($type != 'all')->andWhere("`$type`")->eq($account)->fi() ->orderBy($orderBy) ->beginIF($limit > 0)->limit($limit)->fi() diff --git a/module/doc/control.php b/module/doc/control.php index 050d692c83..9e7eb3a98b 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -44,7 +44,7 @@ class doc extends control $pager = new pager(0, 5, 1); $this->lang->modulePageActions = $this->doc->setFastMenu($this->lang->doc->fast); - $this->lang->modulePageActions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe'") : ''; + $this->lang->modulePageActions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='45%'") : ''; $actionURL = $this->createLink('doc', 'browse', "lib=0&browseType=bySearch&queryID=myQueryID"); $this->doc->buildSearchForm(0, array(), 0, $actionURL, 'index'); @@ -328,7 +328,7 @@ class doc extends control $this->product->setMenu($this->product->getPairs(), $lib->product); $this->lang->set('menugroup.doc', 'product'); - if(common::hasPriv('doc', 'create')) $this->lang->modulePageActions = html::a(helper::createLink('doc', 'create', "libID=$libID"), " " . $this->lang->doc->create, '', "class='btn btn-primary'"); + $this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='45%'") : ''; } elseif($this->from == 'project') { @@ -337,7 +337,7 @@ class doc extends control $this->project->setMenu($this->project->getPairs('nocode'), $lib->project); $this->lang->set('menugroup.doc', 'project'); - if(common::hasPriv('doc', 'create')) $this->lang->modulePageActions = html::a(helper::createLink('doc', 'create', "libID=$libID"), " " . $this->lang->doc->create, '', "class='btn btn-primary'"); + $this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='45%'") : ''; } else { @@ -803,7 +803,7 @@ class doc extends control } elseif($from == 'project') { - $this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib', "from=project&projectID=$objectID"), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe'") : ''; + $this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='45%'") : ''; $this->lang->doc->menu = $this->lang->project->menu; $this->lang->doc->menuOrder = $this->lang->project->menuOrder; $this->project->setMenu($this->project->getPairs('nocode'), $objectID); diff --git a/module/doc/css/createlib.css b/module/doc/css/createlib.css index 6e6ab7818e..e9a3a45c98 100644 --- a/module/doc/css/createlib.css +++ b/module/doc/css/createlib.css @@ -1,5 +1,5 @@ .modal-dialog{width:75%} -form{margin-bottom:130px; padding-left:65px} +form{margin-bottom:100px; padding-left:65px} table{width:90% !important} #whiteListBox div.input-group {margin-bottom: 2px;} diff --git a/module/doc/js/common.js b/module/doc/js/common.js index 262d702e68..e81305c241 100644 --- a/module/doc/js/common.js +++ b/module/doc/js/common.js @@ -16,7 +16,7 @@ function toggleAcl(acl, type) } if(type == 'lib') { - var libType = $('#type').val(); + var libType = $('input[name="type"]').val(); var notice = typeof(noticeAcl[libType][acl]) != 'undefined' ? noticeAcl[libType][acl] : ''; $('#noticeAcl').html(notice); } diff --git a/module/doc/js/createlib.js b/module/doc/js/createlib.js index ba9cfa525d..2d000782e0 100644 --- a/module/doc/js/createlib.js +++ b/module/doc/js/createlib.js @@ -1,11 +1,11 @@ $(function() { - $('#type').change(function() + $('input[name="type"]').change(function() { var libType = $(this).val(); changeByLibType(libType); }) - changeByLibType($('#type').val()); + changeByLibType($('input[name="type"]').val()); toggleAcl($('[name=acl]').val(), 'lib'); }); diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index eed51a77ce..1818f8bf90 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -163,8 +163,8 @@ var browseType = ''; id"), "  " . $doc->title);?> fileSize ? $doc->fileSize : '-';?> addedBy);?> - addedDate, 'm-d H:i');?> - editedDate, 'm-d H:i');?> + addedDate, 'y-m-d');?> + editedDate, 'y-m-d');?> id&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'> diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php index dd05970e64..4a48ed981f 100644 --- a/module/doc/view/createlib.html.php +++ b/module/doc/view/createlib.html.php @@ -23,23 +23,26 @@ - + + + + - @@ -47,7 +50,7 @@ - - +
doc->libType?>
doc->product?>
doclib->name?>
doclib->control;?> + doc->aclList, 'open', "onchange='toggleAcl(this.value, \"lib\")'")?> doc->noticeAcl['lib']['product']['open'];?>
diff --git a/module/story/model.php b/module/story/model.php index 6921f834ed..0d4a51d22c 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1771,6 +1771,7 @@ class storyModel extends model $stories = $this->dao->select('t1.*, t2.name as productTitle')->from(TABLE_STORY)->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') ->where('t1.deleted')->eq(0) + ->beginIF($type != 'closedBy')->andWhere('t1.status')->ne('closed')->fi() ->beginIF($type != 'all') ->beginIF($type == 'assignedTo')->andWhere('assignedTo')->eq($account)->fi() ->beginIF($type == 'openedBy')->andWhere('openedBy')->eq($account)->fi() diff --git a/module/task/model.php b/module/task/model.php index 9c5bb36250..45f9029dba 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1671,7 +1671,7 @@ class taskModel extends model ->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') ->leftjoin(TABLE_STORY)->alias('t3')->on('t1.story = t3.id') ->where('t1.deleted')->eq(0) - ->beginIF($type == 'assignedTo')->andWhere('t1.status')->ne('closed')->fi() + ->beginIF($type != 'closedBy')->andWhere('t1.status')->ne('closed')->fi() ->beginIF($type == 'finishedBy') ->andWhere('t1.finishedby', 1)->eq($account) ->orWhere('t1.finishedList')->like("%,{$account},%")