Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
sakia
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
clients
python
sakia
Commits
981c44ee
Commit
981c44ee
authored
8 years ago
by
inso
Browse files
Options
Downloads
Patches
Plain Diff
Open node in browser is back
parent
63c19fe6
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/sakia/gui/navigation/network/controller.py
+10
-22
10 additions, 22 deletions
src/sakia/gui/navigation/network/controller.py
src/sakia/gui/navigation/network/model.py
+3
-23
3 additions, 23 deletions
src/sakia/gui/navigation/network/model.py
with
13 additions
and
45 deletions
src/sakia/gui/navigation/network/controller.py
+
10
−
22
View file @
981c44ee
...
@@ -24,6 +24,7 @@ class NetworkController(QObject):
...
@@ -24,6 +24,7 @@ class NetworkController(QObject):
table_model
=
self
.
model
.
init_network_table_model
()
table_model
=
self
.
model
.
init_network_table_model
()
self
.
view
.
set_network_table_model
(
table_model
)
self
.
view
.
set_network_table_model
(
table_model
)
self
.
view
.
manual_refresh_clicked
.
connect
(
self
.
refresh_nodes_manually
)
self
.
view
.
manual_refresh_clicked
.
connect
(
self
.
refresh_nodes_manually
)
self
.
view
.
table_network
.
customContextMenuRequested
.
connect
(
self
.
node_context_menu
)
@classmethod
@classmethod
def
create
(
cls
,
parent
,
app
,
network_service
):
def
create
(
cls
,
parent
,
app
,
network_service
):
...
@@ -45,23 +46,9 @@ class NetworkController(QObject):
...
@@ -45,23 +46,9 @@ class NetworkController(QObject):
def
node_context_menu
(
self
,
point
):
def
node_context_menu
(
self
,
point
):
index
=
self
.
view
.
table_network
.
indexAt
(
point
)
index
=
self
.
view
.
table_network
.
indexAt
(
point
)
valid
,
node
,
is_root
=
self
.
model
.
table_model_data
(
index
)
valid
,
node
=
self
.
model
.
table_model_data
(
index
)
if
valid
:
if
self
.
model
.
app
.
parameters
.
expert_mode
:
self
.
view
.
show_menu
(
point
,
is_root
)
menu
=
QMenu
()
menu
=
QMenu
()
if
is_root
:
unset_root
=
QAction
(
self
.
tr
(
"
Unset root node
"
),
self
)
unset_root
.
triggered
.
connect
(
self
.
unset_root_node
)
unset_root
.
setData
(
node
)
if
len
(
self
.
community
.
network
.
root_nodes
)
>
1
:
menu
.
addAction
(
unset_root
)
else
:
set_root
=
QAction
(
self
.
tr
(
"
Set as root node
"
),
self
)
set_root
.
triggered
.
connect
(
self
.
set_root_node
)
set_root
.
setData
(
node
)
menu
.
addAction
(
set_root
)
if
self
.
app
.
preferences
[
'
expert_mode
'
]:
open_in_browser
=
QAction
(
self
.
tr
(
"
Open in browser
"
),
self
)
open_in_browser
=
QAction
(
self
.
tr
(
"
Open in browser
"
),
self
)
open_in_browser
.
triggered
.
connect
(
self
.
open_node_in_browser
)
open_in_browser
.
triggered
.
connect
(
self
.
open_node_in_browser
)
open_in_browser
.
setData
(
node
)
open_in_browser
.
setData
(
node
)
...
@@ -83,6 +70,7 @@ class NetworkController(QObject):
...
@@ -83,6 +70,7 @@ class NetworkController(QObject):
@pyqtSlot
()
@pyqtSlot
()
def
open_node_in_browser
(
self
):
def
open_node_in_browser
(
self
):
node
=
self
.
sender
().
data
()
node
=
self
.
sender
().
data
()
peering
=
bma
.
network
.
Peering
(
node
.
endpoint
.
conn_handler
())
conn_handler
=
next
(
node
.
endpoints
[
0
].
conn_handler
())
url
=
QUrl
(
peering
.
reverse_url
(
"
http
"
,
"
/peering
"
))
peering_url
=
bma
.
API
(
conn_handler
,
bma
.
network
.
URL_PATH
).
reverse_url
(
conn_handler
.
http_scheme
,
'
/peering
'
)
url
=
QUrl
(
peering_url
)
QDesktopServices
.
openUrl
(
url
)
QDesktopServices
.
openUrl
(
url
)
This diff is collapsed.
Click to expand it.
src/sakia/gui/navigation/network/model.py
+
3
−
23
View file @
981c44ee
...
@@ -43,26 +43,6 @@ class NetworkModel(QObject):
...
@@ -43,26 +43,6 @@ class NetworkModel(QObject):
"""
"""
if
index
.
isValid
()
and
index
.
row
()
<
self
.
table_model
.
rowCount
(
QModelIndex
()):
if
index
.
isValid
()
and
index
.
row
()
<
self
.
table_model
.
rowCount
(
QModelIndex
()):
source_index
=
self
.
table_model
.
mapToSource
(
index
)
source_index
=
self
.
table_model
.
mapToSource
(
index
)
is_root_col
=
self
.
table_model
.
sourceModel
().
columns_types
.
index
(
'
is_root
'
)
node
=
self
.
network_service
.
nodes
()[
source_index
.
row
()]
is_root_index
=
self
.
table_model
.
sourceModel
().
index
(
source_index
.
row
(),
is_root_col
)
return
True
,
node
is_root
=
self
.
table_model
.
sourceModel
().
data
(
is_root_index
,
Qt
.
DisplayRole
)
return
False
,
None
node
=
self
.
community
.
network
.
nodes
()[
source_index
.
row
()]
return
True
,
node
,
is_root
return
False
,
None
,
None
def
add_root_node
(
self
,
node
):
"""
The node set as root
:param sakia.data.entities.Node node: the node
"""
node
.
root
=
True
self
.
network_service
.
commit_node
(
node
)
def
unset_root_node
(
self
,
node
):
"""
The node set as root
:param sakia.data.entities.Node node: the node
"""
node
.
root
=
False
self
.
network_service
.
commit_node
(
node
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment