Fossil SCM

An extension of [3941824d] to remove all mention of 'd' capability from the code, not just ifdef or comment it out. Also removes it from the docs and from the default capability set for Developer, dei -> ei.

wyoung 2020-03-12 16:56 trunk
Commit 55a76439382ffc5df495a610392f222fff567463a915abc4b75bcd374babebda
Parent 3941824d8547d8c…
6 files changed +1 -1 -1 +1 -3 -1 +4 -4 -8
~ src/db.c ~ src/json.c ~ src/login.c ~ src/main.c ~ www/caps/index.md ~ www/caps/ref.html
M src/db.c
+1 -1
--- src/db.c
+++ src/db.c
@@ -2074,11 +2074,11 @@
20742074
 "INSERT OR IGNORE INTO user(login,pw,cap,info)"
20752075
 " VALUES('anonymous',hex(randomblob(8)),'hmnc','Anon');"
20762076
 "INSERT OR IGNORE INTO user(login,pw,cap,info)"
20772077
 " VALUES('nobody','','gjorz','Nobody');"
20782078
 "INSERT OR IGNORE INTO user(login,pw,cap,info)"
2079
- " VALUES('developer','','dei','Dev');"
2079
+ " VALUES('developer','','ei','Dev');"
20802080
 "INSERT OR IGNORE INTO user(login,pw,cap,info)"
20812081
 " VALUES('reader','','kptw','Reader');"
20822082
 );
20832083
 }
20842084
 }
20852085
--- src/db.c
+++ src/db.c
@@ -2074,11 +2074,11 @@
2074 "INSERT OR IGNORE INTO user(login,pw,cap,info)"
2075 " VALUES('anonymous',hex(randomblob(8)),'hmnc','Anon');"
2076 "INSERT OR IGNORE INTO user(login,pw,cap,info)"
2077 " VALUES('nobody','','gjorz','Nobody');"
2078 "INSERT OR IGNORE INTO user(login,pw,cap,info)"
2079 " VALUES('developer','','dei','Dev');"
2080 "INSERT OR IGNORE INTO user(login,pw,cap,info)"
2081 " VALUES('reader','','kptw','Reader');"
2082 );
2083 }
2084 }
2085
--- src/db.c
+++ src/db.c
@@ -2074,11 +2074,11 @@
2074 "INSERT OR IGNORE INTO user(login,pw,cap,info)"
2075 " VALUES('anonymous',hex(randomblob(8)),'hmnc','Anon');"
2076 "INSERT OR IGNORE INTO user(login,pw,cap,info)"
2077 " VALUES('nobody','','gjorz','Nobody');"
2078 "INSERT OR IGNORE INTO user(login,pw,cap,info)"
2079 " VALUES('developer','','ei','Dev');"
2080 "INSERT OR IGNORE INTO user(login,pw,cap,info)"
2081 " VALUES('reader','','kptw','Reader');"
2082 );
2083 }
2084 }
2085
M src/json.c
-1
--- src/json.c
+++ src/json.c
@@ -1898,11 +1898,10 @@
18981898
 obj = cson_value_get_object(sub);
18991899
19001900
 #define ADD(X,K) cson_object_set(obj, K, cson_value_new_bool(g.perm.X))
19011901
 ADD(Setup,"setup");
19021902
 ADD(Admin,"admin");
1903
- ADD(Delete,"delete");
19041903
 ADD(Password,"password");
19051904
 ADD(Query,"query"); /* don't think this one is actually used */
19061905
 ADD(Write,"checkin");
19071906
 ADD(Read,"checkout");
19081907
 ADD(Hyperlink,"history");
19091908
--- src/json.c
+++ src/json.c
@@ -1898,11 +1898,10 @@
1898 obj = cson_value_get_object(sub);
1899
1900 #define ADD(X,K) cson_object_set(obj, K, cson_value_new_bool(g.perm.X))
1901 ADD(Setup,"setup");
1902 ADD(Admin,"admin");
1903 ADD(Delete,"delete");
1904 ADD(Password,"password");
1905 ADD(Query,"query"); /* don't think this one is actually used */
1906 ADD(Write,"checkin");
1907 ADD(Read,"checkout");
1908 ADD(Hyperlink,"history");
1909
--- src/json.c
+++ src/json.c
@@ -1898,11 +1898,10 @@
1898 obj = cson_value_get_object(sub);
1899
1900 #define ADD(X,K) cson_object_set(obj, K, cson_value_new_bool(g.perm.X))
1901 ADD(Setup,"setup");
1902 ADD(Admin,"admin");
 
1903 ADD(Password,"password");
1904 ADD(Query,"query"); /* don't think this one is actually used */
1905 ADD(Write,"checkin");
1906 ADD(Read,"checkout");
1907 ADD(Hyperlink,"history");
1908
M src/login.c
+1 -3
--- src/login.c
+++ src/login.c
@@ -1227,20 +1227,19 @@
12271227
 case 'a': p->Admin = p->RdTkt = p->WrTkt = p->Zip =
12281228
 p->RdWiki = p->WrWiki = p->NewWiki =
12291229
 p->ApndWiki = p->Hyperlink = p->Clone =
12301230
 p->NewTkt = p->Password = p->RdAddr =
12311231
 p->TktFmt = p->Attach = p->ApndTkt =
1232
- p->ModWiki = p->ModTkt = p->Delete =
1232
+ p->ModWiki = p->ModTkt =
12331233
 p->RdForum = p->WrForum = p->ModForum =
12341234
 p->WrTForum = p->AdminForum =
12351235
 p->EmailAlert = p->Announce = p->Debug = 1;
12361236
 /* Fall thru into Read/Write */
12371237
 case 'i': p->Read = p->Write = 1; break;
12381238
 case 'o': p->Read = 1; break;
12391239
 case 'z': p->Zip = 1; break;
12401240
1241
- case 'd': p->Delete = 1; /* Not Used */ break;
12421241
 case 'h': p->Hyperlink = 1; break;
12431242
 case 'g': p->Clone = 1; break;
12441243
 case 'p': p->Password = 1; break;
12451244
12461245
 case 'j': p->RdWiki = 1; break;
@@ -1320,11 +1319,10 @@
13201319
 for(i=0; i<nCap && rc && zCap[i]; i++){
13211320
 switch( zCap[i] ){
13221321
 case 'a': rc = p->Admin; break;
13231322
 case 'b': rc = p->Attach; break;
13241323
 case 'c': rc = p->ApndTkt; break;
1325
- case 'd': rc = p->Delete; break; /* Not used */
13261324
 case 'e': rc = p->RdAddr; break;
13271325
 case 'f': rc = p->NewWiki; break;
13281326
 case 'g': rc = p->Clone; break;
13291327
 case 'h': rc = p->Hyperlink; break;
13301328
 case 'i': rc = p->Write; break;
13311329
--- src/login.c
+++ src/login.c
@@ -1227,20 +1227,19 @@
1227 case 'a': p->Admin = p->RdTkt = p->WrTkt = p->Zip =
1228 p->RdWiki = p->WrWiki = p->NewWiki =
1229 p->ApndWiki = p->Hyperlink = p->Clone =
1230 p->NewTkt = p->Password = p->RdAddr =
1231 p->TktFmt = p->Attach = p->ApndTkt =
1232 p->ModWiki = p->ModTkt = p->Delete =
1233 p->RdForum = p->WrForum = p->ModForum =
1234 p->WrTForum = p->AdminForum =
1235 p->EmailAlert = p->Announce = p->Debug = 1;
1236 /* Fall thru into Read/Write */
1237 case 'i': p->Read = p->Write = 1; break;
1238 case 'o': p->Read = 1; break;
1239 case 'z': p->Zip = 1; break;
1240
1241 case 'd': p->Delete = 1; /* Not Used */ break;
1242 case 'h': p->Hyperlink = 1; break;
1243 case 'g': p->Clone = 1; break;
1244 case 'p': p->Password = 1; break;
1245
1246 case 'j': p->RdWiki = 1; break;
@@ -1320,11 +1319,10 @@
1320 for(i=0; i<nCap && rc && zCap[i]; i++){
1321 switch( zCap[i] ){
1322 case 'a': rc = p->Admin; break;
1323 case 'b': rc = p->Attach; break;
1324 case 'c': rc = p->ApndTkt; break;
1325 case 'd': rc = p->Delete; break; /* Not used */
1326 case 'e': rc = p->RdAddr; break;
1327 case 'f': rc = p->NewWiki; break;
1328 case 'g': rc = p->Clone; break;
1329 case 'h': rc = p->Hyperlink; break;
1330 case 'i': rc = p->Write; break;
1331
--- src/login.c
+++ src/login.c
@@ -1227,20 +1227,19 @@
1227 case 'a': p->Admin = p->RdTkt = p->WrTkt = p->Zip =
1228 p->RdWiki = p->WrWiki = p->NewWiki =
1229 p->ApndWiki = p->Hyperlink = p->Clone =
1230 p->NewTkt = p->Password = p->RdAddr =
1231 p->TktFmt = p->Attach = p->ApndTkt =
1232 p->ModWiki = p->ModTkt =
1233 p->RdForum = p->WrForum = p->ModForum =
1234 p->WrTForum = p->AdminForum =
1235 p->EmailAlert = p->Announce = p->Debug = 1;
1236 /* Fall thru into Read/Write */
1237 case 'i': p->Read = p->Write = 1; break;
1238 case 'o': p->Read = 1; break;
1239 case 'z': p->Zip = 1; break;
1240
 
1241 case 'h': p->Hyperlink = 1; break;
1242 case 'g': p->Clone = 1; break;
1243 case 'p': p->Password = 1; break;
1244
1245 case 'j': p->RdWiki = 1; break;
@@ -1320,11 +1319,10 @@
1319 for(i=0; i<nCap && rc && zCap[i]; i++){
1320 switch( zCap[i] ){
1321 case 'a': rc = p->Admin; break;
1322 case 'b': rc = p->Attach; break;
1323 case 'c': rc = p->ApndTkt; break;
 
1324 case 'e': rc = p->RdAddr; break;
1325 case 'f': rc = p->NewWiki; break;
1326 case 'g': rc = p->Clone; break;
1327 case 'h': rc = p->Hyperlink; break;
1328 case 'i': rc = p->Write; break;
1329
M src/main.c
-1
--- src/main.c
+++ src/main.c
@@ -78,11 +78,10 @@
7878
 ** Holds flags for fossil user permissions.
7979
 */
8080
 struct FossilUserPerms {
8181
 char Setup; /* s: use Setup screens on web interface */
8282
 char Admin; /* a: administrative permission */
83
- char Delete; /* d: delete wiki or tickets - Not Used */
8483
 char Password; /* p: change password */
8584
 char Query; /* q: create new reports */
8685
 char Write; /* i: xfer inbound. check-in */
8786
 char Read; /* o: xfer outbound. check-out */
8887
 char Hyperlink; /* h: enable the display of hyperlinks */
8988
--- src/main.c
+++ src/main.c
@@ -78,11 +78,10 @@
78 ** Holds flags for fossil user permissions.
79 */
80 struct FossilUserPerms {
81 char Setup; /* s: use Setup screens on web interface */
82 char Admin; /* a: administrative permission */
83 char Delete; /* d: delete wiki or tickets - Not Used */
84 char Password; /* p: change password */
85 char Query; /* q: create new reports */
86 char Write; /* i: xfer inbound. check-in */
87 char Read; /* o: xfer outbound. check-out */
88 char Hyperlink; /* h: enable the display of hyperlinks */
89
--- src/main.c
+++ src/main.c
@@ -78,11 +78,10 @@
78 ** Holds flags for fossil user permissions.
79 */
80 struct FossilUserPerms {
81 char Setup; /* s: use Setup screens on web interface */
82 char Admin; /* a: administrative permission */
 
83 char Password; /* p: change password */
84 char Query; /* q: create new reports */
85 char Write; /* i: xfer inbound. check-in */
86 char Read; /* o: xfer outbound. check-out */
87 char Hyperlink; /* h: enable the display of hyperlinks */
88
M www/caps/index.md
+4 -4
--- www/caps/index.md
+++ www/caps/index.md
@@ -65,12 +65,12 @@
6565
 Fossil shows how these capabilities apply hierarchically in the user
6666
 editing screen (Admin → Users → name) with the `[N]` `[A]` `[D]` `[R]`
6767
 tags next to each capability check box. If a user gets a capability from
6868
 one of the user categories already assigned to it, there is no value in
6969
 redundantly assigning that same cap to the user explicitly. For example,
70
-with the default **dei** cap set for the “developer” category, the cap
71
-set **ve** is redundant because **v** grants **dei**, which includes
70
+with the default **ei** cap set for the “developer” category, the cap
71
+set **ve** is redundant because **v** grants **ei**, which includes
7272
 **e**.
7373
7474
 We suggest that you lean heavily on these fixed user categories when
7575
 setting up new users. Ideally, your users will group neatly into one of
7676
 the predefined categories, but if not, you might be able to shoehorn
@@ -151,12 +151,12 @@
151151
 are all about modifying repository content: edit existing wiki pages,
152152
 change one’s own password, create new ticket report formats, and modify
153153
 existing tickets. This category would be better named “participant”.
154154
155155
 Those in the “developer” category get the “nobody” and “anonymous” cap
156
-sets plus **[d][d][e][e][i][i]**: delete wiki articles and tickets, view
157
-sensitive user material, and check in changes.
156
+sets plus **[e][e][i][i]**: view
157
+sensitive user material and check in changes.
158158
159159
 [bot]: ../antibot.wiki
160160
161161
162162
 ## <a name="pvt"></a>Consequences of Taking a Repository Private
163163
--- www/caps/index.md
+++ www/caps/index.md
@@ -65,12 +65,12 @@
65 Fossil shows how these capabilities apply hierarchically in the user
66 editing screen (Admin → Users → name) with the `[N]` `[A]` `[D]` `[R]`
67 tags next to each capability check box. If a user gets a capability from
68 one of the user categories already assigned to it, there is no value in
69 redundantly assigning that same cap to the user explicitly. For example,
70 with the default **dei** cap set for the “developer” category, the cap
71 set **ve** is redundant because **v** grants **dei**, which includes
72 **e**.
73
74 We suggest that you lean heavily on these fixed user categories when
75 setting up new users. Ideally, your users will group neatly into one of
76 the predefined categories, but if not, you might be able to shoehorn
@@ -151,12 +151,12 @@
151 are all about modifying repository content: edit existing wiki pages,
152 change one’s own password, create new ticket report formats, and modify
153 existing tickets. This category would be better named “participant”.
154
155 Those in the “developer” category get the “nobody” and “anonymous” cap
156 sets plus **[d][d][e][e][i][i]**: delete wiki articles and tickets, view
157 sensitive user material, and check in changes.
158
159 [bot]: ../antibot.wiki
160
161
162 ## <a name="pvt"></a>Consequences of Taking a Repository Private
163
--- www/caps/index.md
+++ www/caps/index.md
@@ -65,12 +65,12 @@
65 Fossil shows how these capabilities apply hierarchically in the user
66 editing screen (Admin → Users → name) with the `[N]` `[A]` `[D]` `[R]`
67 tags next to each capability check box. If a user gets a capability from
68 one of the user categories already assigned to it, there is no value in
69 redundantly assigning that same cap to the user explicitly. For example,
70 with the default **ei** cap set for the “developer” category, the cap
71 set **ve** is redundant because **v** grants **ei**, which includes
72 **e**.
73
74 We suggest that you lean heavily on these fixed user categories when
75 setting up new users. Ideally, your users will group neatly into one of
76 the predefined categories, but if not, you might be able to shoehorn
@@ -151,12 +151,12 @@
151 are all about modifying repository content: edit existing wiki pages,
152 change one’s own password, create new ticket report formats, and modify
153 existing tickets. This category would be better named “participant”.
154
155 Those in the “developer” category get the “nobody” and “anonymous” cap
156 sets plus **[e][e][i][i]**: view
157 sensitive user material and check in changes.
158
159 [bot]: ../antibot.wiki
160
161
162 ## <a name="pvt"></a>Consequences of Taking a Repository Private
163
M www/caps/ref.html
-8
--- www/caps/ref.html
+++ www/caps/ref.html
@@ -71,18 +71,10 @@
7171
 <td>
7272
 Append comments to existing tickets. Mnemonic: <b>c</b>omment.
7373
 </td>
7474
 </tr>
7575
76
- <tr id="d">
77
- <th>d</th>
78
- <th>Delete</th>
79
- <td>
80
- Delete wiki articles or tickets. Mnemonic: <b>d</b>elete.
81
- </td>
82
- </tr>
83
-
8476
 <tr id="e">
8577
 <th>e</th>
8678
 <th>RdAddr</th>
8779
 <td>
8880
 View <a
8981
--- www/caps/ref.html
+++ www/caps/ref.html
@@ -71,18 +71,10 @@
71 <td>
72 Append comments to existing tickets. Mnemonic: <b>c</b>omment.
73 </td>
74 </tr>
75
76 <tr id="d">
77 <th>d</th>
78 <th>Delete</th>
79 <td>
80 Delete wiki articles or tickets. Mnemonic: <b>d</b>elete.
81 </td>
82 </tr>
83
84 <tr id="e">
85 <th>e</th>
86 <th>RdAddr</th>
87 <td>
88 View <a
89
--- www/caps/ref.html
+++ www/caps/ref.html
@@ -71,18 +71,10 @@
71 <td>
72 Append comments to existing tickets. Mnemonic: <b>c</b>omment.
73 </td>
74 </tr>
75
 
 
 
 
 
 
 
 
76 <tr id="e">
77 <th>e</th>
78 <th>RdAddr</th>
79 <td>
80 View <a
81

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button