Small fix due to a misunderstood of the ucoinpy Transfer class.

duniter · Feb 27, 2014 · 5d3ccde · 5d3ccde
1 parent e388a22
commit 5d3ccde
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ RESOURCE_DIR = res/ui
 COMPILED_DIR = src/cutecoin/gen_resources
 
 #UI files to compile
-UI_FILES = mainwindow.ui addAccountDialog.ui addCommunityDialog.ui communityTabWidget.ui issuanceDialog.ui transferDialog.ui
+UI_FILES = mainwindow.ui addAccountDialog.ui addCommunityDialog.ui communityTabWidget.ui issuanceDialog.ui transferDialog.ui addContactDialog.ui
 #Qt resource files to compile
 RESOURCES = 
 

diff --git a/src/cutecoin/gui/transferMoneyDialog.py b/src/cutecoin/gui/transferMoneyDialog.py
@@ -62,7 +62,7 @@ def openManageWalletCoins(self):
         pass
 
     def accept(self):
-        sentCoins = self.listView_coinsSent.model().toString()
+        sentCoins = self.listView_coinsSent.model().toList()
         recipient = None
 
         if self.radio_keyFingerprint.isChecked():

diff --git a/src/cutecoin/models/account/__init__.py b/src/cutecoin/models/account/__init__.py
@@ -95,14 +95,12 @@ def lastIssuances(self, community):
 
     def issuedLastDividend(self, community):
         currentAmendmentNumber = community.amendmentNumber()
-
         if community in self.communities.communitiesList:
             dividendsData = community.ucoinRequest(ucoin.hdc.transactions.sender.issuance.Dividend(self.keyFingerprint(), currentAmendmentNumber))
             for dividend in dividendsData:
                 # Small bug in ucoinpy library
                 if not isinstance(dividend, str):
                     return True
-
         return False
 
     def issueDividend(self, community, coins):
@@ -112,7 +110,7 @@ def issueDividend(self, community, coins):
             return issuance()
 
     def transferCoins(self, node, recipient, coins, message):
-        transfer = ucoin.wrappers.transactions.Transfer(self.keyFingerprint(), recipient.fingerprint, coins, message, keyid=self.pgpKeyId, server=node.server, port=node.port)
+        transfer = ucoin.wrappers.transactions.RawTransfer(self.keyFingerprint(), recipient.fingerprint, coins, message, keyid=self.pgpKeyId, server=node.server, port=node.port)
         return transfer()
 
     def jsonify(self):

diff --git a/src/cutecoin/models/coin/listModel.py b/src/cutecoin/models/coin/listModel.py
@@ -29,9 +29,8 @@ def data(self,index,role):
     def flags(self,index):
         return Qt.ItemIsSelectable | Qt.ItemIsEnabled
 
-    def toString(self):
+    def toList(self):
         coinsList = []
         for c in self.coins:
             coinsList.append(c.getId())
-        coinsStr = ",".join(coinsList)
-        return coinsStr
+        return coinsList