3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

DL: Align with online backend on allowed characters.

Browse source 
CURA-8395
This commit is contained in:
Remco Burema 2021-07-20 17:58:29 +02:00
parent 918d1f188b
commit 71937bf828
No known key found for this signature in database
GPG key ID: 215C49431D43F98C
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml
View file

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

4
plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml
View file

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

6
plugins/DigitalLibrary/src/DigitalFactoryApiClient.py
View file

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