fix(PRofileShowcase): Fixing conflict merge error
This commit is contained in:
parent
29e3e41410
commit
822e170b6d
|
@ -58,6 +58,13 @@ QObject {
|
||||||
name: "membersCount"
|
name: "membersCount"
|
||||||
expression: model.members.count
|
expression: model.members.count
|
||||||
expectedRoles: ["members"]
|
expectedRoles: ["members"]
|
||||||
|
},
|
||||||
|
FastExpressionRole {
|
||||||
|
name: "showcaseVisibility"
|
||||||
|
expression: getShowcaseVisibility()
|
||||||
|
function getShowcaseVisibility() {
|
||||||
|
return Constants.ShowcaseVisibility.Everyone
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -79,6 +86,13 @@ QObject {
|
||||||
name: "saved"
|
name: "saved"
|
||||||
expression: root.isAddressSaved(model.address)
|
expression: root.isAddressSaved(model.address)
|
||||||
expectedRoles: ["address"]
|
expectedRoles: ["address"]
|
||||||
|
},
|
||||||
|
FastExpressionRole {
|
||||||
|
name: "showcaseVisibility"
|
||||||
|
expression: getShowcaseVisibility()
|
||||||
|
function getShowcaseVisibility() {
|
||||||
|
return Constants.ShowcaseVisibility.Everyone
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -92,6 +106,13 @@ QObject {
|
||||||
name: "showcaseKey"
|
name: "showcaseKey"
|
||||||
expression: model.uid
|
expression: model.uid
|
||||||
expectedRoles: ["uid"]
|
expectedRoles: ["uid"]
|
||||||
|
},
|
||||||
|
FastExpressionRole {
|
||||||
|
name: "showcaseVisibility"
|
||||||
|
expression: getShowcaseVisibility()
|
||||||
|
function getShowcaseVisibility() {
|
||||||
|
return Constants.ShowcaseVisibility.Everyone
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -241,8 +241,6 @@ Control {
|
||||||
}
|
}
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
print ("!!communitiesProxyModel", JSON.stringify(StatusQUtils.ModelUtils.modelToArray(communitiesProxyModel)))
|
|
||||||
|
|
||||||
if (root.readOnly)
|
if (root.readOnly)
|
||||||
return
|
return
|
||||||
root.closeRequested()
|
root.closeRequested()
|
||||||
|
|
Loading…
Reference in New Issue