Merge pull request #7380 from slarosa/fix_18485

m-kuhn · web-flow · commit c4b9106872c3 · 2018-07-09T11:19:12.000-05:00
Fixes #18485 - do not truncate project title if filename contains period
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -508,7 +508,7 @@ QString QgsProject::baseName() const
   }
   else
   {
-    return QFileInfo( mFile.fileName() ).baseName();
+    return QFileInfo( mFile.fileName() ).completeBaseName();
   }
 }
 
diff --git a/tests/src/python/test_qgsproject.py b/tests/src/python/test_qgsproject.py
@@ -1091,6 +1091,20 @@ def testLayerChangeDirtiesProject(self):
         self.assertTrue(l.setSubsetString('class=\'a\''))
         self.assertTrue(p.isDirty())
 
+    def testProjectTitleWithPeriod(self):
+        tmpDir = QTemporaryDir()
+        tmpFile = "{}/2.18.21.qgs".format(tmpDir.path())
+        tmpFile2 = "{}/qgis-3.2.0.qgs".format(tmpDir.path())
+
+        p0 = QgsProject()
+        p0.setFileName(tmpFile)
+
+        p1 = QgsProject()
+        p1.setFileName(tmpFile2)
+
+        self.assertEqual(p0.baseName(), '2.18.21')
+        self.assertEqual(p1.baseName(), 'qgis-3.2.0')
+
 
 if __name__ == '__main__':
     unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ QString QgsProject::baseName() const`
`508`	`508`	`}`
`509`	`509`	`else`
`510`	`510`	`{`
`511`		`- return QFileInfo( mFile.fileName() ).baseName();`
	`511`	`+ return QFileInfo( mFile.fileName() ).completeBaseName();`
`512`	`512`	`}`
`513`	`513`	`}`
`514`	`514`