Fossil SCM

Update JSON code to account for new capabilities. Also, the 'setup' and 'admin' capabilities should imply 'debug'.

mistachkin 2018-08-26 02:20 trunk merge

Commit 3f12d4066184e92bbf933e01ae12334e216b85a7ba53385aede3475813500f4d

Parent 86ff84dac89c243…

3 files changed +9 +1 -1 +1 -1

M src/json.c

		--- src/json.c
		+++ src/json.c
		@@ -1890,10 +1890,19 @@
1890	1890	ADD(Attach,"attachFile");
1891	1891	ADD(TktFmt,"createTicketReport");
1892	1892	ADD(RdAddr,"readPrivate");
1893	1893	ADD(Zip,"zip");
1894	1894	ADD(Private,"xferPrivate");
	1895	+ ADD(WrUnver,"writeUnversioned");
	1896	+ ADD(RdForum,"readForum");
	1897	+ ADD(WrForum,"writeForum");
	1898	+ ADD(WrTForum,"writeTrustedForum");
	1899	+ ADD(ModForum,"moderateForum");
	1900	+ ADD(AdminForum,"adminForum");
	1901	+ ADD(EmailAlert,"emailAlert");
	1902	+ ADD(Announce,"announce");
	1903	+ ADD(Debug,"debug");
1895	1904	#undef ADD
1896	1905	return payload;
1897	1906	}
1898	1907
1899	1908	/*
1900	1909

	--- src/json.c
	+++ src/json.c
	@@ -1890,10 +1890,19 @@
1890	ADD(Attach,"attachFile");
1891	ADD(TktFmt,"createTicketReport");
1892	ADD(RdAddr,"readPrivate");
1893	ADD(Zip,"zip");
1894	ADD(Private,"xferPrivate");









1895	#undef ADD
1896	return payload;
1897	}
1898
1899	/*
1900

	--- src/json.c
	+++ src/json.c
	@@ -1890,10 +1890,19 @@
1890	ADD(Attach,"attachFile");
1891	ADD(TktFmt,"createTicketReport");
1892	ADD(RdAddr,"readPrivate");
1893	ADD(Zip,"zip");
1894	ADD(Private,"xferPrivate");
1895	ADD(WrUnver,"writeUnversioned");
1896	ADD(RdForum,"readForum");
1897	ADD(WrForum,"writeForum");
1898	ADD(WrTForum,"writeTrustedForum");
1899	ADD(ModForum,"moderateForum");
1900	ADD(AdminForum,"adminForum");
1901	ADD(EmailAlert,"emailAlert");
1902	ADD(Announce,"announce");
1903	ADD(Debug,"debug");
1904	#undef ADD
1905	return payload;
1906	}
1907
1908	/*
1909

M src/login.c

+1 -1

		--- src/login.c
		+++ src/login.c
		@@ -1262,11 +1262,11 @@
1262	1262	p->NewTkt = p->Password = p->RdAddr =
1263	1263	p->TktFmt = p->Attach = p->ApndTkt =
1264	1264	p->ModWiki = p->ModTkt = p->Delete =
1265	1265	p->RdForum = p->WrForum = p->ModForum =
1266	1266	p->WrTForum = p->AdminForum =
1267		- p->EmailAlert = p->Announce =
	1267	+ p->EmailAlert = p->Announce = p->Debug =
1268	1268	p->WrUnver = p->Private = 1;
1269	1269	/* Fall thru into Read/Write */
1270	1270	case 'i': p->Read = p->Write = 1; break;
1271	1271	case 'o': p->Read = 1; break;
1272	1272	case 'z': p->Zip = 1; break;
1273	1273

	--- src/login.c
	+++ src/login.c
	@@ -1262,11 +1262,11 @@
1262	p->NewTkt = p->Password = p->RdAddr =
1263	p->TktFmt = p->Attach = p->ApndTkt =
1264	p->ModWiki = p->ModTkt = p->Delete =
1265	p->RdForum = p->WrForum = p->ModForum =
1266	p->WrTForum = p->AdminForum =
1267	p->EmailAlert = p->Announce =
1268	p->WrUnver = p->Private = 1;
1269	/* Fall thru into Read/Write */
1270	case 'i': p->Read = p->Write = 1; break;
1271	case 'o': p->Read = 1; break;
1272	case 'z': p->Zip = 1; break;
1273

	--- src/login.c
	+++ src/login.c
	@@ -1262,11 +1262,11 @@
1262	p->NewTkt = p->Password = p->RdAddr =
1263	p->TktFmt = p->Attach = p->ApndTkt =
1264	p->ModWiki = p->ModTkt = p->Delete =
1265	p->RdForum = p->WrForum = p->ModForum =
1266	p->WrTForum = p->AdminForum =
1267	p->EmailAlert = p->Announce = p->Debug =
1268	p->WrUnver = p->Private = 1;
1269	/* Fall thru into Read/Write */
1270	case 'i': p->Read = p->Write = 1; break;
1271	case 'o': p->Read = 1; break;
1272	case 'z': p->Zip = 1; break;
1273

M src/login.c

+1 -1

		--- src/login.c
		+++ src/login.c
		@@ -1262,11 +1262,11 @@
1262	1262	p->NewTkt = p->Password = p->RdAddr =
1263	1263	p->TktFmt = p->Attach = p->ApndTkt =
1264	1264	p->ModWiki = p->ModTkt = p->Delete =
1265	1265	p->RdForum = p->WrForum = p->ModForum =
1266	1266	p->WrTForum = p->AdminForum =
1267		- p->EmailAlert = p->Announce =
	1267	+ p->EmailAlert = p->Announce = p->Debug =
1268	1268	p->WrUnver = p->Private = 1;
1269	1269	/* Fall thru into Read/Write */
1270	1270	case 'i': p->Read = p->Write = 1; break;
1271	1271	case 'o': p->Read = 1; break;
1272	1272	case 'z': p->Zip = 1; break;
1273	1273

	--- src/login.c
	+++ src/login.c
	@@ -1262,11 +1262,11 @@
1262	p->NewTkt = p->Password = p->RdAddr =
1263	p->TktFmt = p->Attach = p->ApndTkt =
1264	p->ModWiki = p->ModTkt = p->Delete =
1265	p->RdForum = p->WrForum = p->ModForum =
1266	p->WrTForum = p->AdminForum =
1267	p->EmailAlert = p->Announce =
1268	p->WrUnver = p->Private = 1;
1269	/* Fall thru into Read/Write */
1270	case 'i': p->Read = p->Write = 1; break;
1271	case 'o': p->Read = 1; break;
1272	case 'z': p->Zip = 1; break;
1273

	--- src/login.c
	+++ src/login.c
	@@ -1262,11 +1262,11 @@
1262	p->NewTkt = p->Password = p->RdAddr =
1263	p->TktFmt = p->Attach = p->ApndTkt =
1264	p->ModWiki = p->ModTkt = p->Delete =
1265	p->RdForum = p->WrForum = p->ModForum =
1266	p->WrTForum = p->AdminForum =
1267	p->EmailAlert = p->Announce = p->Debug =
1268	p->WrUnver = p->Private = 1;
1269	/* Fall thru into Read/Write */
1270	case 'i': p->Read = p->Write = 1; break;
1271	case 'o': p->Read = 1; break;
1272	case 'z': p->Zip = 1; break;
1273