Fossil SCM
s/status/state/, for consistency.
Commit
8f496ed159976bd64291e5cf8b52da21cc8a71c6
Parent
9575eb5d2add29f…
2 files changed
+1
-1
+1
-1
+1
-1
| --- src/json_artifact.c | ||
| +++ src/json_artifact.c | ||
| @@ -330,11 +330,11 @@ | ||
| 330 | 330 | cson_object * row = cson_value_get_object(cson_sqlite3_row_to_object(q.pStmt)); |
| 331 | 331 | char const isNew = cson_value_get_bool(cson_object_get(row,"isNew")); |
| 332 | 332 | char const isDel = cson_value_get_bool(cson_object_get(row,"isDel")); |
| 333 | 333 | cson_object_set(row, "isNew", NULL); |
| 334 | 334 | cson_object_set(row, "isDel", NULL); |
| 335 | - cson_object_set(row, "status", | |
| 335 | + cson_object_set(row, "state", | |
| 336 | 336 | json_new_string(json_artifact_status_to_string(isNew, isDel))); |
| 337 | 337 | cson_array_append( checkin_arr, cson_object_value(row) ); |
| 338 | 338 | } |
| 339 | 339 | db_finalize(&q); |
| 340 | 340 | return cson_object_value(pay); |
| 341 | 341 |
| --- src/json_artifact.c | |
| +++ src/json_artifact.c | |
| @@ -330,11 +330,11 @@ | |
| 330 | cson_object * row = cson_value_get_object(cson_sqlite3_row_to_object(q.pStmt)); |
| 331 | char const isNew = cson_value_get_bool(cson_object_get(row,"isNew")); |
| 332 | char const isDel = cson_value_get_bool(cson_object_get(row,"isDel")); |
| 333 | cson_object_set(row, "isNew", NULL); |
| 334 | cson_object_set(row, "isDel", NULL); |
| 335 | cson_object_set(row, "status", |
| 336 | json_new_string(json_artifact_status_to_string(isNew, isDel))); |
| 337 | cson_array_append( checkin_arr, cson_object_value(row) ); |
| 338 | } |
| 339 | db_finalize(&q); |
| 340 | return cson_object_value(pay); |
| 341 |
| --- src/json_artifact.c | |
| +++ src/json_artifact.c | |
| @@ -330,11 +330,11 @@ | |
| 330 | cson_object * row = cson_value_get_object(cson_sqlite3_row_to_object(q.pStmt)); |
| 331 | char const isNew = cson_value_get_bool(cson_object_get(row,"isNew")); |
| 332 | char const isDel = cson_value_get_bool(cson_object_get(row,"isDel")); |
| 333 | cson_object_set(row, "isNew", NULL); |
| 334 | cson_object_set(row, "isDel", NULL); |
| 335 | cson_object_set(row, "state", |
| 336 | json_new_string(json_artifact_status_to_string(isNew, isDel))); |
| 337 | cson_array_append( checkin_arr, cson_object_value(row) ); |
| 338 | } |
| 339 | db_finalize(&q); |
| 340 | return cson_object_value(pay); |
| 341 |
+1
-1
| --- src/json_finfo.c | ||
| +++ src/json_finfo.c | ||
| @@ -130,11 +130,11 @@ | ||
| 130 | 130 | cson_object_set(row, "timestamp", json_new_int( db_column_int(&q,3) )); |
| 131 | 131 | cson_object_set(row, "user", json_new_string( db_column_text(&q,4) )); |
| 132 | 132 | cson_object_set(row, "comment", json_new_string( db_column_text(&q,5) )); |
| 133 | 133 | /*cson_object_set(row, "bgColor", json_new_string( db_column_text(&q,7) ));*/ |
| 134 | 134 | cson_object_set(row, "size", cson_value_new_integer( (cson_int_t)db_column_int64(&q,8) )); |
| 135 | - cson_object_set(row, "status", | |
| 135 | + cson_object_set(row, "state", | |
| 136 | 136 | json_new_string(json_artifact_status_to_string(isNew,isDel))); |
| 137 | 137 | if( (0 < limit) && (++currentRow >= limit) ){ |
| 138 | 138 | break; |
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 |
| --- src/json_finfo.c | |
| +++ src/json_finfo.c | |
| @@ -130,11 +130,11 @@ | |
| 130 | cson_object_set(row, "timestamp", json_new_int( db_column_int(&q,3) )); |
| 131 | cson_object_set(row, "user", json_new_string( db_column_text(&q,4) )); |
| 132 | cson_object_set(row, "comment", json_new_string( db_column_text(&q,5) )); |
| 133 | /*cson_object_set(row, "bgColor", json_new_string( db_column_text(&q,7) ));*/ |
| 134 | cson_object_set(row, "size", cson_value_new_integer( (cson_int_t)db_column_int64(&q,8) )); |
| 135 | cson_object_set(row, "status", |
| 136 | json_new_string(json_artifact_status_to_string(isNew,isDel))); |
| 137 | if( (0 < limit) && (++currentRow >= limit) ){ |
| 138 | break; |
| 139 | } |
| 140 | } |
| 141 |
| --- src/json_finfo.c | |
| +++ src/json_finfo.c | |
| @@ -130,11 +130,11 @@ | |
| 130 | cson_object_set(row, "timestamp", json_new_int( db_column_int(&q,3) )); |
| 131 | cson_object_set(row, "user", json_new_string( db_column_text(&q,4) )); |
| 132 | cson_object_set(row, "comment", json_new_string( db_column_text(&q,5) )); |
| 133 | /*cson_object_set(row, "bgColor", json_new_string( db_column_text(&q,7) ));*/ |
| 134 | cson_object_set(row, "size", cson_value_new_integer( (cson_int_t)db_column_int64(&q,8) )); |
| 135 | cson_object_set(row, "state", |
| 136 | json_new_string(json_artifact_status_to_string(isNew,isDel))); |
| 137 | if( (0 < limit) && (++currentRow >= limit) ){ |
| 138 | break; |
| 139 | } |
| 140 | } |
| 141 |