Skip to content

[4.11] CLOUDSTACK-10299: UI: fix error in network listing in project mode#2464

Merged
rafaelweingartner merged 2 commits into
apache:4.11from
resmo:fix/4.11/CLOUDSTACK-10299
Feb 27, 2018
Merged

[4.11] CLOUDSTACK-10299: UI: fix error in network listing in project mode#2464
rafaelweingartner merged 2 commits into
apache:4.11from
resmo:fix/4.11/CLOUDSTACK-10299

Conversation

@resmo

@resmo resmo commented Feb 20, 2018

Copy link
Copy Markdown
Member

Statically passing account (and domainid) results in a conflict when in project view because projectid and account can not be used together.

Removing the 2 params. fixes the issue. (some whitespace fixes along)

@resmo resmo changed the title CLOUDSTACK-10299: UI: fix error in network listing in project mode [4.11] CLOUDSTACK-10299: UI: fix error in network listing in project mode Feb 20, 2018
@resmo resmo added this to the 4.11.1 milestone Feb 20, 2018
Comment thread ui/scripts/network.js Outdated
}

/*$.ajax({

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

You have gone over some commented code. What about removing it?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I didn't see a reason why to remove comments, I wanted to fix the issue. Whitespace cleanup was made by my editor automatically.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Well.. the commented code is not used. So, there is your reason to remove it. The less "code" (lines) for our eyes to see, the better.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I see your point. cleaning up commented out code makes sense.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Great. Thanks!

@rafaelweingartner

Copy link
Copy Markdown
Member

@resmo thanks for the contributions, but I have a doubt. You say it (the PR) is aimed at 4.11, but you opened a PR against master branch. Which one do you want?

@resmo resmo changed the base branch from master to 4.11 February 21, 2018 06:40
@resmo

resmo commented Feb 21, 2018

Copy link
Copy Markdown
Member Author

@rafaelweingartner changed the base to 4.11

@borisstoyanov

Copy link
Copy Markdown
Contributor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@borisstoyanov a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

Comment thread ui/scripts/network.js
$.ajax({
url: createURL('listRemoteAccessVpns'),
data: {
account: g_account,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this call only used in the project view?
I mean, if I list networks and I am out of the project view, should not ACS filter by these data? Or, is it done automatically in the server side when the users is logged-in?

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1728

@borisstoyanov borisstoyanov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@resmo Can we have some screenshots please?

@resmo

resmo commented Feb 21, 2018

Copy link
Copy Markdown
Member Author

@borisstoyanov before or after the patch? I attached the screenshot to the issue in jira. Didn't make one after the patch, as you see "nothing" (no error).

@borisstoyanov

Copy link
Copy Markdown
Contributor

@resmo both if you have. If no, new stuff is what's interesting :)

@resmo

resmo commented Feb 26, 2018

Copy link
Copy Markdown
Member Author

Before

selection_149

After

selection_151

@resmo

resmo commented Feb 26, 2018

Copy link
Copy Markdown
Member Author

ready for review

@borisstoyanov borisstoyanov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@DaanHoogland

Copy link
Copy Markdown
Contributor

@borisstoyanov @rafaelweingartner is this merge ready?

@rafaelweingartner

Copy link
Copy Markdown
Member

There is still one open question of mine there. It is about some parameters that were removed. I am asking if that removal can affect the loading of information for the default view (view outside of project).

@resmo

resmo commented Feb 27, 2018

Copy link
Copy Markdown
Member Author

@rafaelweingartner I couldn't test the view with having existing remote vpns configured. But my assumption was that the api is working identically as other list apis returning the results of the current owner.

@rafaelweingartner

Copy link
Copy Markdown
Member

Got it. I think this one is ready to be merged then.

@DaanHoogland

Copy link
Copy Markdown
Contributor

anything holding you back, @rafaelweingartner ?

@rafaelweingartner

Copy link
Copy Markdown
Member

Nothing... I was busy with some other things.
I am merging this one now

@rafaelweingartner rafaelweingartner merged commit 0bb20a7 into apache:4.11 Feb 27, 2018
rafaelweingartner added a commit that referenced this pull request Feb 27, 2018
[4.11] CLOUDSTACK-10299: UI: fix error in network listing in project mode
@resmo resmo deleted the fix/4.11/CLOUDSTACK-10299 branch September 21, 2018 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants