fix converting from text to list bug

MoroccanHackers · Aug 11, 2012 · 71553d5 · 71553d5
1 parent 797eb8b
commit 71553d5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/MangoDatabase/helper.cpp b/MangoDatabase/helper.cpp
@@ -4,7 +4,12 @@ namespace Database {
 
 QStringList Helper::fromTextToList(QString text)
 {
-    return text.split(",");
+    QStringList tmp;
+
+    if ( !text.isEmpty() )
+        tmp = text.split(",");
+
+    return tmp;
 }
 
 QString Helper::fromListToText(QStringList ids)

diff --git a/MangoReports/ordersdetailsreport.cpp b/MangoReports/ordersdetailsreport.cpp
@@ -16,7 +16,7 @@ OrdersDetailsReport::OrdersDetailsReport(const QDateTime& from, const QDateTime&
 QString OrdersDetailsReport::getHTML()
 {
     QString orignalHTML = getTemplateFileContent();
-    orignalHTML = orignalHTML.replace("%DETAIL_REPORT_TYPE%", "Orders Details Report");
+    orignalHTML = orignalHTML.replace("%DETAIL_REPORT_TYPE%", "تقرير بتفاصيل الطلبات");
     orignalHTML = orignalHTML.replace("%DETAIL_TABLE%", getTableData());
 
     return orignalHTML;

diff --git a/MangoService/helper.cpp b/MangoService/helper.cpp
@@ -4,7 +4,12 @@ namespace Services {
 
 QStringList Helper::fromTextToList(QString text)
 {
-    return text.split(",");
+    QStringList tmp;
+
+    if ( !text.isEmpty() )
+        tmp = text.split(",");
+
+    return tmp;
 }
 
 QString Helper::fromListToText(QStringList ids)

diff --git a/MangoService/orderdetail.cpp b/MangoService/orderdetail.cpp
@@ -7,6 +7,7 @@
 #include "component.h"
 #include "itemdetail.h"
 #include "itemcomponent.h"
+#include <QDebug>
 
 namespace Services {
 
@@ -46,16 +47,16 @@ QList<Model::OrderDetail> OrderDetail::getByOrderId(int orderId)
 
         QList<Model::Component> components;
         foreach (Model::Component c, i->components()) {
-            c = Services::Component::getById(c.id());
-            components.append(c);
+            Model::Component tmp = Services::Component::getById(c.id());
+            components.append(tmp);
         }
 
         i->setComponent(components);
 
         QList<Model::Additional> additional;
         foreach (Model::Additional a, i->additionals()) {
-            a = Services::Additional::getById(a.id());
-            additional.append(a);
+            Model::Additional tmp = Services::Additional::getById(a.id());
+            additional.append(tmp);
         }
 
         i->setAdditionals(additional);