diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 747e7e45c2cafc5eee6cc7d8e92f0c40353fd011..e62888dacba6d9d9d9391b6a5ea0580386add0ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,9 +27,8 @@ build-release: #This will be executed if you push on master, it makes a new rele only: - master script: - - export version='cat VERSION' + - export version=`cat VERSION` - echo "building branch $CI_COMMIT_REF_NAME, Version $version" - - 'curl -X POSRT --silent --show-error --fail --header "PRIVATE-TOKEN: ${GITLAB_TOKEN}"https://gitlab.jonasled.de/api/v4/projects/${CI_PROJECT_ID}/repository/tags?tag_name=$version&ref=${CI_COMMIT_SHS}' #Tag the current commit with the version. - sudo docker image prune -f #Delete old unused images - sudo docker pull python:3 - sudo docker build -t gitlab.jonasled.de/jonasled/url_shorter_docker . #Build the image with the name already set to push diff --git a/VERSION b/VERSION index bbf649f614c57a3330b5adfe56a93905628c2f7f..5849151fd3b1235d5f4831b9c385e156e4cc2c55 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.3 \ No newline at end of file +1.7.5 \ No newline at end of file diff --git a/main.py b/main.py index 3b0d466d9e4966e64a8fef627b5c0216c53546f6..a8d80a39af16c346237b1f597f9d4e3a0996a79c 100644 --- a/main.py +++ b/main.py @@ -304,7 +304,7 @@ def ownLinks(): for entries in entriesList: #for every entrie in the database add a line to the table response = response + "<tr>\n<td>" + entries[0] + "</td>\n<td>" + entries[1] + '</td>\n<td><a id="red" href="/user/delete?link=' + escape(entries[1]) + '">delete</a> <a href="#" id="dialog-link" onclick="buttonListener(\'' + entries[1] + '\', this)">QR</a></tr>\n' response = response + "</table>" #Close the table - if(len(entriesList) == 0): response = 'you have no shorten links. <a href="/">back</a>' #If user has no shorten links make this message with a back button + if(len(entriesList) == 0): response = 'you have no shorten links.' #If user has no shorten links make this message except: abort(500) #Shouldn't happen, 500 means internal server error return render_template('editEntries.html', content=response, loginbar=loginbar, cookieNotice=cookieNotice) #Put the table and the login div inside the template and server it to the user diff --git a/templates/editEntries.html b/templates/editEntries.html index 3d540a1da7ccfcfb827180048449462ac04c0a66..bbd79acbdf866a33680386d2c4a59ef05d424646 100644 --- a/templates/editEntries.html +++ b/templates/editEntries.html @@ -14,6 +14,7 @@ <div class="login-page"> <div class="form"> {{content | safe}} + <p><a href="/">back</a></p> </div> </div> <!-- ui-dialog -->