Browse Source

show error messages when editing favorites

pull/82/head
Aaron Parecki 8 years ago
parent
commit
793199ad4e
No known key found for this signature in database GPG Key ID: 276C2817346D6056
  1. 14
      controllers/controllers.php
  2. 7
      views/new-favorite.php

14
controllers/controllers.php

@ -441,12 +441,21 @@ $app->post('/favorite', function() use($app) {
if($user=require_login($app)) { if($user=require_login($app)) {
$params = $app->request()->params(); $params = $app->request()->params();
$error = false;
if(isset($params['edit'])) { if(isset($params['edit'])) {
$r = edit_favorite($user, $params['edit'], $params['like_of']); $r = edit_favorite($user, $params['edit'], $params['like_of']);
if(isset($r['location']) && $r['location']) if(isset($r['location']) && $r['location'])
$location = $r['location']; $location = $r['location'];
else
elseif(in_array($r['code'], [200,201,204]))
$location = $params['edit']; $location = $params['edit'];
elseif(in_array($r['code'], [401,403])) {
$location = false;
$error = 'Your Micropub endpoint denied the request. Check that Quill is authorized to update posts.';
} else {
$location = false;
$error = 'Your Micropub endpoint did not return a location header or a recognized response code';
}
} else { } else {
$r = create_favorite($user, $params['like_of']); $r = create_favorite($user, $params['like_of']);
$location = $r['location']; $location = $r['location'];
@ -455,7 +464,8 @@ $app->post('/favorite', function() use($app) {
$app->response()['Content-type'] = 'application/json'; $app->response()['Content-type'] = 'application/json';
$app->response()->body(json_encode(array( $app->response()->body(json_encode(array(
'location' => $location, 'location' => $location,
'error' => $r['error']
'error' => $r['error'],
'error_details' => $error,
))); )));
} }
}); });

7
views/new-favorite.php

@ -32,7 +32,7 @@
$(function(){ $(function(){
$("#btn_post").click(function(){ $("#btn_post").click(function(){
$("#btn_post").addClass("loading disabled").text("Working...");
$("#btn_post").addClass("loading disabled");
var syndications = []; var syndications = [];
$("#syndication-container button.btn-info").each(function(i,btn){ $("#syndication-container button.btn-info").each(function(i,btn){
@ -53,7 +53,10 @@ $(function(){
} else { } else {
$("#test_success").addClass('hidden'); $("#test_success").addClass('hidden');
$("#test_error").removeClass('hidden'); $("#test_error").removeClass('hidden');
$("#btn_post").removeClass("loading disabled").text("Post");
if(response.error_details) {
$("#test_error").text(response.error_details);
}
$("#btn_post").removeClass("loading disabled");
} }
}); });

Loading…
Cancel
Save