Skip to content

Commit ed5a56e

Browse files
committed
BUG#35797406 Add missing question marks to some prompt actions
Some prompt actions contain what are supposed to be questions that require the user intervention. These have their appropriate description and are usually precedded by a [y/N] placeholder, which indicates the possible answers. However, some of these questions do not have a proper trailing question mark. This patch adds those missing trailing question marks to the corresponding prompt actions. Change-Id: I9caac9df85d1d20fea4d8479fcf70c4f72acb19e
1 parent 9f6a2a9 commit ed5a56e

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

gui/extension/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
- Updated TypeScript MRS SDK and fixed compilation issues
8282
- BUG#35649509 "mrs.add.db_object()" cannot add schema automatically
8383
- BUG#35745272 Excessively deep and possibly infinite type instantiation for GEOMETRY values
84+
- BUG#35797406 Questions that prompt for user action do not have trailing question marks
8485

8586
## Changes in 1.12.0+8.1.1
8687

mrs_plugin/db_objects.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ def add_db_object(**kwargs):
294294
if requires_auth is None:
295295
if interactive:
296296
requires_auth = lib.core.prompt(
297-
"Should the db_object require authentication [y/N]: ",
297+
"Should the db_object require authentication? [y/N]: ",
298298
{'defaultValue': 'n'}).strip().lower() == 'y'
299299
else:
300300
requires_auth = False
@@ -304,7 +304,7 @@ def add_db_object(**kwargs):
304304
if interactive:
305305
row_user_ownership_enforced = lib.core.prompt(
306306
"Should row ownership be required when querying the "
307-
"object [y/N]: ",
307+
"object? [y/N]: ",
308308
{'defaultValue': 'n'}).strip().lower() == 'y'
309309
else:
310310
row_user_ownership_enforced = False
@@ -332,7 +332,7 @@ def add_db_object(**kwargs):
332332
if items_per_page is None:
333333
if interactive:
334334
items_per_page = lib.core.prompt(
335-
"How many items should be listed per page "
335+
"How many items should be listed per page? "
336336
"[Schema Default]: ",
337337
{'defaultValue': "25"}).strip()
338338
if items_per_page:

mrs_plugin/docs/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,8 +1238,8 @@ <h4 data-number="4.1.3.2" id="rest-apis"><span
12381238
<span id="cb13-10"><a href="#cb13-10" aria-hidden="true" tabindex="-1"></a></span>
12391239
<span id="cb13-11"><a href="#cb13-11" aria-hidden="true" tabindex="-1"></a><span class="ex">Please</span> enter the name or index of a schema: 4</span>
12401240
<span id="cb13-12"><a href="#cb13-12" aria-hidden="true" tabindex="-1"></a><span class="ex">Please</span> enter the request path for this schema [/sakila]: /sakila</span>
1241-
<span id="cb13-13"><a href="#cb13-13" aria-hidden="true" tabindex="-1"></a><span class="ex">Should</span> the schema require authentication [y/N]:</span>
1242-
<span id="cb13-14"><a href="#cb13-14" aria-hidden="true" tabindex="-1"></a><span class="ex">How</span> many items should be listed per page [Schema Default]:</span>
1241+
<span id="cb13-13"><a href="#cb13-13" aria-hidden="true" tabindex="-1"></a><span class="ex">Should</span> the schema require authentication<span class="pp">?</span> [y/N]:</span>
1242+
<span id="cb13-14"><a href="#cb13-14" aria-hidden="true" tabindex="-1"></a><span class="ex">How</span> many items should be listed per page<span class="pp">?</span> [Schema Default]:</span>
12431243
<span id="cb13-15"><a href="#cb13-15" aria-hidden="true" tabindex="-1"></a><span class="ex">Comments:</span></span>
12441244
<span id="cb13-16"><a href="#cb13-16" aria-hidden="true" tabindex="-1"></a><span class="ex">Options:</span></span>
12451245
<span id="cb13-17"><a href="#cb13-17" aria-hidden="true" tabindex="-1"></a></span>
@@ -1401,9 +1401,9 @@ <h4 data-number="4.1.3.2" id="rest-apis"><span
14011401
<span id="cb17-38"><a href="#cb17-38" aria-hidden="true" tabindex="-1"></a> <span class="ex">3</span> MEDIA</span>
14021402
<span id="cb17-39"><a href="#cb17-39" aria-hidden="true" tabindex="-1"></a></span>
14031403
<span id="cb17-40"><a href="#cb17-40" aria-hidden="true" tabindex="-1"></a><span class="ex">Please</span> select the CRUD operation format [FEED]:</span>
1404-
<span id="cb17-41"><a href="#cb17-41" aria-hidden="true" tabindex="-1"></a><span class="ex">Should</span> the db_object require authentication [y/N]:</span>
1405-
<span id="cb17-42"><a href="#cb17-42" aria-hidden="true" tabindex="-1"></a><span class="ex">Should</span> row ownership be required when querying the object [y/N]:</span>
1406-
<span id="cb17-43"><a href="#cb17-43" aria-hidden="true" tabindex="-1"></a><span class="ex">How</span> many items should be listed per page [Schema Default]:</span>
1404+
<span id="cb17-41"><a href="#cb17-41" aria-hidden="true" tabindex="-1"></a><span class="ex">Should</span> the db_object require authentication<span class="pp">?</span> [y/N]:</span>
1405+
<span id="cb17-42"><a href="#cb17-42" aria-hidden="true" tabindex="-1"></a><span class="ex">Should</span> row ownership be required when querying the object<span class="pp">?</span> [y/N]:</span>
1406+
<span id="cb17-43"><a href="#cb17-43" aria-hidden="true" tabindex="-1"></a><span class="ex">How</span> many items should be listed per page<span class="pp">?</span> [Schema Default]:</span>
14071407
<span id="cb17-44"><a href="#cb17-44" aria-hidden="true" tabindex="-1"></a><span class="ex">Comments:</span></span>
14081408
<span id="cb17-45"><a href="#cb17-45" aria-hidden="true" tabindex="-1"></a></span>
14091409
<span id="cb17-46"><a href="#cb17-46" aria-hidden="true" tabindex="-1"></a><span class="ex">Object</span> added successfully.</span></code></pre></div>

mrs_plugin/docs/sections/devGuide/AddingRESTServices.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ When started without parameters, an interactive wizard prompts you for the requi
194194
195195
Please enter the name or index of a schema: 4
196196
Please enter the request path for this schema [/sakila]: /sakila
197-
Should the schema require authentication [y/N]:
198-
How many items should be listed per page [Schema Default]:
197+
Should the schema require authentication? [y/N]:
198+
How many items should be listed per page? [Schema Default]:
199199
Comments:
200200
Options:
201201
@@ -319,9 +319,9 @@ Please select the CRUD operations that should be supported, '*' for all [READ]:
319319
3 MEDIA
320320
321321
Please select the CRUD operation format [FEED]:
322-
Should the db_object require authentication [y/N]:
323-
Should row ownership be required when querying the object [y/N]:
324-
How many items should be listed per page [Schema Default]:
322+
Should the db_object require authentication? [y/N]:
323+
Should row ownership be required when querying the object? [y/N]:
324+
How many items should be listed per page? [Schema Default]:
325325
Comments:
326326
327327
Object added successfully.

mrs_plugin/lib/schemas.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ def prompt_for_request_path(schema_name) -> str:
6464

6565
def prompt_for_requires_auth() -> bool:
6666
return core.prompt(
67-
"Should the schema require authentication [y/N]: ",
67+
"Should the schema require authentication? [y/N]: ",
6868
{'defaultValue': 'n'}).strip().lower() == 'y'
6969

7070

7171
def prompt_for_items_per_page() -> int:
7272
while True:
7373
result = core.prompt(
74-
"How many items should be listed per page [Schema Default]: ",
74+
"How many items should be listed per page? [Schema Default]: ",
7575
{'defaultValue': '25'}).strip()
7676

7777
try:

0 commit comments

Comments
 (0)