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
aebb5116
Commit
aebb5116
authored
8 years ago
by
inso
Browse files
Options
Downloads
Patches
Plain Diff
Fix membership publishing
parent
6f353796
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/informations/controller.py
+3
-4
3 additions, 4 deletions
src/sakia/gui/navigation/informations/controller.py
src/sakia/gui/navigation/informations/model.py
+7
-1
7 additions, 1 deletion
src/sakia/gui/navigation/informations/model.py
with
10 additions
and
5 deletions
src/sakia/gui/navigation/informations/controller.py
+
3
−
4
View file @
aebb5116
...
@@ -106,13 +106,12 @@ class InformationsController(QObject):
...
@@ -106,13 +106,12 @@ class InformationsController(QObject):
@asyncify
@asyncify
async
def
send_join_demand
(
self
,
checked
=
False
):
async
def
send_join_demand
(
self
,
checked
=
False
):
connection
=
await
self
.
view
.
ask_for_connection
(
self
.
model
.
connections_with_uids
())
if
not
self
.
model
.
connection
:
if
not
connection
:
return
return
secret_key
,
password
=
await
PasswordInputController
.
open_dialog
(
self
,
connection
)
secret_key
,
password
=
await
PasswordInputController
.
open_dialog
(
self
,
self
.
model
.
connection
)
if
not
password
or
not
secret_key
:
if
not
password
or
not
secret_key
:
return
return
result
=
await
self
.
model
.
send_join
(
connection
,
secret_key
,
password
)
result
=
await
self
.
model
.
send_join
(
secret_key
,
password
)
if
result
[
0
]:
if
result
[
0
]:
if
self
.
model
.
notifications
():
if
self
.
model
.
notifications
():
toast
.
display
(
self
.
tr
(
"
Membership
"
),
self
.
tr
(
"
Success sending Membership demand
"
))
toast
.
display
(
self
.
tr
(
"
Membership
"
),
self
.
tr
(
"
Success sending Membership demand
"
))
...
...
This diff is collapsed.
Click to expand it.
src/sakia/gui/navigation/informations/model.py
+
7
−
1
View file @
aebb5116
...
@@ -171,3 +171,9 @@ class InformationsModel(QObject):
...
@@ -171,3 +171,9 @@ class InformationsModel(QObject):
:return: the community in short currency format
:return: the community in short currency format
"""
"""
return
shortened
(
self
.
connection
.
currency
)
return
shortened
(
self
.
connection
.
currency
)
def
notifications
(
self
):
return
self
.
app
.
parameters
.
notifications
async
def
send_join
(
self
,
secret_key
,
password
):
return
await
self
.
app
.
documents_service
.
send_membership
(
self
.
connection
,
secret_key
,
password
,
"
IN
"
)
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