Skip to content
  • Projects
  • Groups
  • Snippets
  • Help

Codecrew / Moya

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 30
  • Merge Requests 2
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Merged
Merge Request !345 opened Sep 30, 2016 by Tuukka Kivilahti@tkfftk

fixet product option multiplation bug

asiat monistu, ei monistu enää perkele. Lisätty poisto jotta pääsen monistuneista eroon!

Edited Oct 02, 2016
Request to merge tkfftk:multiBugFromProductOption into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.codecrew.fi/tkfftk/moya.git multiBugFromProductOption
git checkout -b tkfftk/moya-multiBugFromProductOption FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff tkfftk/moya-multiBugFromProductOption

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Merged

  • The changes were merged into master.
  • Discussion 2
  • Commits 3
  • Changes 5
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 2a54e04ac87f85d4d091c3be1c8f9cea?s=80&d=identicon
    Tuukka Kivilahti
    @tkfftk started a discussion on the diff Sep 30, 2016
    code/moya-beans/doc/help-doc.html
    101 101 <LI>Nested Class Summary<LI>Field Summary<LI>Constructor Summary<LI>Method Summary
    102 102 <P>
    103 103 <LI>Field Detail<LI>Constructor Detail<LI>Method Detail</UL>
    104 Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the priority they appear in the source code. This preserves the logical groupings established by the programmer.</BLOCKQUOTE>
    104 Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</BLOCKQUOTE>
    • Tuukka Kivilahti @tkfftk commented Sep 30, 2016
      Owner

      korjasin takas

  • 2a54e04ac87f85d4d091c3be1c8f9cea?s=80&d=identicon
    Tuukka Kivilahti
    @tkfftk started a discussion on an outdated diff Sep 30, 2016
    code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/ProductView.java
    254 257 prodbean.mergeChanges(product);
    255 258  
    256 // need to update this instance
    257 //productOptionGroup = product.getProductOptionGroups().get(product.getProductOptionGroups().indexOf(productOptionGroup));
    258 /*
    259 for(ProductOption option : productOptionGroup.getOptions()) {
    260 if(!option.getProductOptionGroup().equals(productOptionGroup))
    261 option.setProductOptionGroup(productOptionGroup);
    262
    263 prodbean.createOrMerge(option);
    264 }
    259 productOptionGroup = null;
    265 260  
    266 productOptionGroup = null;*/
    261 // flush product, I liek id's for everyone
    262 product = prodbean.findById(product.getId());
    • Tuukka Kivilahti @tkfftk commented Sep 30, 2016
      Owner

      Tuotetta tallentaessa kaikki luodut monistu, korjattu tällä

  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • 537fd8cb - findById -> reload
    Oct 02, 2016

    Added 1 commit:

    • 537fd8cb - findById -> reload
    Toggle commit list
  • Tuomas Riihimäki @tuomari

    Status changed to merged

    Oct 02, 2016

    Status changed to merged

    Toggle commit list
  • Tuomas Riihimäki @tuomari

    mentioned in commit e327d0b3

    Oct 02, 2016

    mentioned in commit e327d0b3

    Toggle commit list
  • Write
  • Preview
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
2
2 participants
Reference: codecrew/moya!345
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.