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

Edit journal entity #1511

Merged
merged 3 commits into from
Apr 19, 2017

Conversation

mbayopanda
Copy link
Collaborator

This PR add the option of editing the entity of transactions in the posting journal.

@mbayopanda
Copy link
Collaborator Author

mbayopanda commented Apr 15, 2017

@jniles @sfount could you review this PR
I don't know how to fix this $rootScope:inprog error

_.each(result, (row, uid) => transaction.addQuery(UPDATE_JOURNAL_ROW, [row, db.bid(uid)]));
_.each(result, (row, uid) => {
db.convert(row, ['entity_uuid']);
return transaction.addQuery(UPDATE_JOURNAL_ROW, [row, db.bid(uid)]);
Copy link
Collaborator

Choose a reason for hiding this comment

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

You do not need this return here.

@@ -307,15 +307,18 @@ function editTransaction(req, res, next) {
transformColumns(rowsAdded, true)
.then((result) => {
result.forEach((row) => {
db.convert(row, ['uuid', 'record_uuid']);
db.convert(row, ['uuid', 'record_uuid', 'entity_uuid']);
Copy link
Collaborator

Choose a reason for hiding this comment

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

👍

* @public
*
*/
Transactions.prototype.editCellGrid = function editCellGrid(rowEntity, field, value) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you make this function the same function as editCell? It looks duplicated. And if it must be a different function, can this just call editCell internally?

@ghost
Copy link

ghost commented Apr 18, 2017

☔ The latest upstream changes (presumably 2b2435d) made this pull request unmergeable. Please resolve the merge conflicts.

@jniles
Copy link
Collaborator

jniles commented Apr 18, 2017

@mbayopanda, whoops.... sorry about that :(

@jniles
Copy link
Collaborator

jniles commented Apr 19, 2017

@kwilu try

@ghost
Copy link

ghost commented Apr 19, 2017

⌛ Trying commit 0479fd8 with merge 2a907df...

ghost pushed a commit that referenced this pull request Apr 19, 2017
Edit journal entity

This PR add the option of editing the entity of transactions in the posting journal.
@mbayopanda
Copy link
Collaborator Author

@kwilu try

@ghost
Copy link

ghost commented Apr 19, 2017

@mbayopanda: 🔑 Insufficient privileges: Not in reviewers

update transaction service

Fix and enhancement

Fix $digest error and enhancement

Fix issues from review
@ghost
Copy link

ghost commented Apr 19, 2017

⌛ Trying commit 0479fd8 with merge 51c2d94...

ghost pushed a commit that referenced this pull request Apr 19, 2017
Edit journal entity

This PR add the option of editing the entity of transactions in the posting journal.
@jniles
Copy link
Collaborator

jniles commented Apr 19, 2017

LGTM!

@jniles jniles merged commit 33b167c into Third-Culture-Software:master Apr 19, 2017
@mbayopanda mbayopanda deleted the edit_journal_entity branch August 22, 2017 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants