Browse Source

DL: Align with online backend on allowed characters.

CURA-8395
Remco Burema 3 years ago
parent
commit
71937bf828

+ 2 - 2
plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml

@@ -93,7 +93,7 @@ Popup
         }
         validator: RegExpValidator
         {
-            regExp: /^[^\\\/\*\?\|\[\]]{0,96}$/
+            regExp: /^[^\\\/\*\?\|\[\]]{0,99}$/
         }
 
         text: PrintInformation.jobName
@@ -148,7 +148,7 @@ Popup
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         text: "Create"
-        enabled: newProjectNameTextField.text != "" && !busy
+        enabled: newProjectNameTextField.text.length >= 2 && !busy
 
         onClicked:
         {

+ 2 - 2
plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml

@@ -63,7 +63,7 @@ Item
         anchors.topMargin: UM.Theme.getSize("thin_margin").height
         validator: RegExpValidator
         {
-            regExp: /^[^\\\/\*\?\|\[\]]{0,96}$/
+            regExp: /^[\w\-\. ()]{0,255}$/
         }
 
         text: PrintInformation.jobName
@@ -200,7 +200,7 @@ Item
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         text: "Save"
-        enabled: (asProjectCheckbox.checked || asSlicedCheckbox.checked) && dfFilenameTextfield.text != ""
+        enabled: (asProjectCheckbox.checked || asSlicedCheckbox.checked) && dfFilenameTextfield.text.length >= 3
 
         onClicked:
         {

+ 2 - 4
plugins/DigitalLibrary/src/DigitalFactoryApiClient.py

@@ -365,12 +365,10 @@ class DigitalFactoryApiClient:
         :param on_finished: The function to be called after the result is parsed.
         :param on_error: The function to be called if anything goes wrong.
         """
-
-        display_name = re.sub(r"^[\\w\\-\\. ()]+\\.[a-zA-Z0-9]+$", " ", project_name)
-        Logger.log("i", "Attempt to create new DF project '{}'.".format(display_name))
+        Logger.log("i", "Attempt to create new DF project '{}'.".format(project_name))
 
         url = "{}/projects".format(self.CURA_API_ROOT)
-        data = json.dumps({"data": {"display_name": display_name}}).encode()
+        data = json.dumps({"data": {"display_name": project_name}}).encode()
         self._http.put(url,
                        scope = self._scope,
                        data = data,