Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2024-10-27 20:34:16 +00:00
Code Issues Projects Releases Wiki Activity

Personal_wikis: Change json name from 'main_page' to 'mainpage'

Browse Source
This commit is contained in:
gnosygnu 2017-02-21 16:59:59 -05:00
parent edb23bb47e
commit fa056807d5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
400_xowa/src/gplx/xowa/addons/wikis/directorys/dbs/Xowdir_wiki_json.java
View File

@ -27,7 +27,7 @@ public class Xowdir_wiki_json {
wtr.Nde_bgn("core"); wtr.Nde_bgn("core");
wtr.Kv_str("name", name); wtr.Kv_str("name", name);
wtr.Kv_str("main_page", main_page); wtr.Kv_str("mainpage", main_page);
wtr.Nde_end(); wtr.Nde_end();
wtr.Doc_nde_end(); wtr.Doc_nde_end();
@ -37,7 +37,7 @@ public class Xowdir_wiki_json {
public static Xowdir_wiki_json New_by_json(Json_parser json_parser, String json) { public static Xowdir_wiki_json New_by_json(Json_parser json_parser, String json) {
Json_doc jdoc = json_parser.Parse(json); Json_doc jdoc = json_parser.Parse(json);
String name = jdoc.Get_val_as_str_or(Bry_.Ary("core", "name"), ""); String name = jdoc.Get_val_as_str_or(Bry_.Ary("core", "name"), "");
String main_page = jdoc.Get_val_as_str_or(Bry_.Ary("core", "main_page"), ""); String main_page = jdoc.Get_val_as_str_or(Bry_.Ary("core", "mainpage"), "");
return new Xowdir_wiki_json(name, main_page); return new Xowdir_wiki_json(name, main_page);
} }
public static Xowdir_wiki_json New_empty() { public static Xowdir_wiki_json New_empty() {

2
400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/Xowdir_item_doc.java
View File

@ -32,7 +32,7 @@ public class Xowdir_item_doc implements Mustache_doc_itm {
else if (String_.Eq(key, "domain")) bfr.Add_str_u8(domain); else if (String_.Eq(key, "domain")) bfr.Add_str_u8(domain);
else if (String_.Eq(key, "name")) bfr.Add_str_u8(name); else if (String_.Eq(key, "name")) bfr.Add_str_u8(name);
else if (String_.Eq(key, "dir")) bfr.Add_str_u8(dir); else if (String_.Eq(key, "dir")) bfr.Add_str_u8(dir);
else if (String_.Eq(key, "main_page")) bfr.Add_str_u8(main_page); else if (String_.Eq(key, "mainpage")) bfr.Add_str_u8(main_page);
else return false; else return false;
return true; return true;
} }