Skip to content
Snippets Groups Projects

ZAINABS work + my basic list locations page and route to help with this issue

Closed ZAINABS work + my basic list locations page and route to help with this issue
14-as-a-user-i-want-to-view-a-list-of-all-locations-available into development
Closed Liam Driscoll requested to merge 14-as-a-user-i-want-to-view-a-list-of-all-locations-available into development
Viewing commit 9ca6d9f7
Prev Next
Show latest version
1 file
+ 0
− 4
Compare changes
  • Side-by-side
  • Inline
project_server.py
+ 0
− 4
@@ -28,8 +28,6 @@ def returnManageCoworkingSpaces():
@@ -28,8 +28,6 @@ def returnManageCoworkingSpaces():
if (request.method == 'GET'):
if (request.method == 'GET'):
return render_template("Manage_Coworking_Spaces.html")
return render_template("Manage_Coworking_Spaces.html")
<<<<<<< Updated upstream
=======
@app.route("/ListLocations", methods=['GET'])
@app.route("/ListLocations", methods=['GET'])
def returnListLocations():
def returnListLocations():
if (request.method =='GET'):
if (request.method =='GET'):
@@ -72,8 +70,6 @@ def Load():
@@ -72,8 +70,6 @@ def Load():
return render_template('Space.html', data = data)
return render_template('Space.html', data = data)
# pageAddress = Address, pageMain_Photo = Main_Photo, pageAdditional_photos = Additional_photos, pageDescription = Description, pageWebsite = Website, pageOpening_Hours = Opening_Hours )
# pageAddress = Address, pageMain_Photo = Main_Photo, pageAdditional_photos = Additional_photos, pageDescription = Description, pageWebsite = Website, pageOpening_Hours = Opening_Hours )
>>>>>>> Stashed changes
@app.route("/SearchRecord", methods=['POST', 'GET'])
@app.route("/SearchRecord", methods=['POST', 'GET'])
def searchRecord():
def searchRecord():