Skip to content
This repository was archived by the owner on Sep 16, 2022. It is now read-only.

Conversation

@rptrchv
Copy link
Contributor

@rptrchv rptrchv commented Feb 10, 2020

No description provided.

@a-martynovich a-martynovich changed the base branch from master to new-ui February 10, 2020 08:15
@a-martynovich
Copy link
Contributor

@rptrchv changed base branch to new-ui, now there's a conflict.

let obj = document.getElementById(`${e.id}`)
let src = obj.getAttribute("data-src1");
e.setAttribute('src', src);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Please remove all commits which add changes to this file. All those commits are in new-ui-actions and there will be conflicts.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can't do it myself without full understanding of the problem and proposed solution. If you can't provide that - pls fix it yourself

/* Firefox */
input[type=number] {
-moz-appearance:textfield;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this disable spins for number inputs? Why?

Choose a reason for hiding this comment

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

Yes, it disables spins. But this one is misplaced. We can remove it from there.

Does this disable spins for number inputs? Why?

Yes, it disables spins, but this one is misplaced, we can remove it.

Choose a reason for hiding this comment

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

removed!

</div>

</div>
<!-- <style>
Copy link
Contributor

Choose a reason for hiding this comment

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

@dvidotti shouldn't this be removed?

Choose a reason for hiding this comment

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

Removed!

<th scope="row">IP</th>
<td>{{ object.deviceinfo.ipv4_address|default_if_none:'N/A' }}</td>
<td class="wott-table-label" scope="row">IP</td>
<td>{{ object.deviceinfo.ipv4_address|default:'N/A' }}</td>
Copy link
Contributor

Choose a reason for hiding this comment

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

AFAIK ipv4_address and fqdn may also be empty, for example if an interface was not assigned an IP address yet. This new code will treat them as "N/A". I think we shouldn't make such changes in a redesign branch without discussing them in detail.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

IMO "N/A" quite fits this case. @vpetersson WDYT?

Copy link
Contributor

Choose a reason for hiding this comment

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

It's not ideal, but let's leave it as is for now and iterate later.

<div class="tab wott-box-shadow">
{% include 'device_info_tabs.html' with active="overview" %}
<div class="wott-table-content ">
<div class="wott-table-conten">
Copy link
Contributor

Choose a reason for hiding this comment

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

typo?

Choose a reason for hiding this comment

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

yes, should be content

Copy link
Contributor

Choose a reason for hiding this comment

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

@dvidotti Ok so please push this fix.

Choose a reason for hiding this comment

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

Fixed and pushed

$('#revoke-button').click(() => mixpanel.track("Revoke"));
});
</script>
{% endif %}
Copy link
Contributor

Choose a reason for hiding this comment

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

please remove this change

Copy link
Contributor Author

Choose a reason for hiding this comment

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

why? if it improves readability and fix wrong indentation?

Copy link
Contributor

Choose a reason for hiding this comment

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

  1. it's not wrong
  2. you've indented the whole block => no readability changes
  3. there are zero useful changes here, yet they will remain in history which is already cluttered.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just ignore this here. I'll avoid such things in the future

self.assertContains(response, 'telnetd</li>')
self.assertContains(response, 'fingerd</li>')
self.assertContains(response, '\n telnetd\n </li>')
self.assertContains(response, '\n fingerd\n </li>')
Copy link
Contributor

Choose a reason for hiding this comment

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

Either use assertInHTML or choose a shorter pattern to look for. Adding a whitespace in HTML template shouldn't break tests.

if 'global_policy' in request.POST:
form = FirewallStateGlobalPolicyForm(request.POST, instance=firewallstate)
if form.is_valid():
# TODO: check isn't it enough to do `form.save()` here.
Copy link
Contributor

Choose a reason for hiding this comment

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

todo when ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Some day in the future. I don't have plans/tasks for this ATM

Copy link
Contributor

Choose a reason for hiding this comment

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

I guess I read this sentence wrong. Does it say there isn't enough checks? If so, then ok

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, I meant we may do redundant work there. But it's not urgent to check/fix that

@rptrchv
Copy link
Contributor Author

rptrchv commented Feb 10, 2020

@rptrchv changed base branch to new-ui, now there's a conflict.

fixed

@a-martynovich a-martynovich merged commit da6317b into new-ui Feb 10, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants