Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Couch db get subproject and get project #1493

Merged
merged 9 commits into from
Jan 22, 2016

Conversation

gluneau
Copy link
Contributor

@gluneau gluneau commented Jan 19, 2016

No description provided.

Dave MacFarlane and others added 7 commits December 15, 2015 13:28
The base NDB_Menu_Filter class maintains the filters
as you go between pages. This means that if you set
a search key, and then go to a page which doesn't have
any searchKeywords fields defined, the SQL generated
becomes invalid.

This updates the code so that the filter checks if
$this->searchKeyword is set and non-empty (the field
defined by the form) instead of $this->searchKey['keyword']
(the field with the user input)
Fixed bug where search keyword crashes other menus
…ame-table-not-in-join

should be conflicts_resolved not conflicts_unresolved table
@gluneau gluneau added the Bug PR or issue introducing/requiring bug fixes (not mutually exclusive with the Feature label) label Jan 19, 2016
@gluneau gluneau added this to the 16.04 milestone Jan 19, 2016
@codecov-io
Copy link

Current coverage is 10.93%

Merging #1493 into 16.04-dev will not affect coverage as of b87a99f

@@            16.04-dev   #1493   diff @@
=========================================
  Files             103     103       
  Stmts           18031   18031       
  Branches            0       0       
  Methods          1020    1020       
=========================================
  Hit              1971    1971       
  Partial             0       0       
  Missed          16060   16060       

Review entire Coverage Diff as of b87a99f

Powered by Codecov. Updated on successful CI builds.

if($subproj['id'] == $id) {
return $subproj['title'];
}
$subprojs = $config->getProjectSettings($id);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this variable seems to be misnamed.. this is getting projects, not subprojects.

driusan added a commit that referenced this pull request Jan 22, 2016
…oject

Couch db get subproject and get project
@driusan driusan merged commit 8c25a6c into aces:16.04-dev Jan 22, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug PR or issue introducing/requiring bug fixes (not mutually exclusive with the Feature label)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants