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_wiki: Make domain and mainpage readonly when editing existing entries

Browse Source
This commit is contained in:
gnosygnu 2017-02-10 18:39:13 -05:00
parent b2781ffc9d
commit 8bc1a37531
3 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
400_xowa/src/gplx/xowa/Xoa_app_.java
View File

@ -33,7 +33,7 @@ public class Xoa_app_ {
}
public static final String Name = "xowa";
public static final int Version_id = 514;
public static final String Version = "4.1.3.1702"; // RELEASE:2017-01-03 20:30
public static final String Version = "4.1.4.1702"; // RELEASE:2017-01-03 20:30
public static String Build_date = "2012-12-30 00:00:00";
public static String Build_date_fmt = "yyyy-MM-dd HH:mm:ss";
public static String Op_sys_str;

31
400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/Xowdir_item_mgr.java
View File

@ -39,9 +39,11 @@ class Xowdir_item_mgr {
Xowdir_db_mgr db_mgr = new Xowdir_db_mgr(app.User().User_db_mgr().Conn());
Io_url dir_url = Io_url_.new_dir_infer(dir_str);
Xowdir_wiki_itm old_item = db_mgr.Tbl__wiki().Select_by_key_or_null(domain);
// validate
String err_msg = Validate(app, db_mgr, domain, name, dir_url, mainpage_name);
mainpage_name = String_.Replace(mainpage_name, " ", "_");
String err_msg = Validate(app, db_mgr, itm_is_new, domain, name, dir_url, mainpage_name);
if (err_msg != null) {
app.Gui__cbk_mgr().Send_json(cbk_trg, "xo.wiki_directory.notify__recv", gplx.core.gfobjs.Gfobj_nde.New().Add_str("msg_text", err_msg));
return;
@ -51,6 +53,7 @@ class Xowdir_item_mgr {
Io_url fil_url = dir_url.GenSubFil(domain + ".xowa");
Xowdir_wiki_json json = Xowdir_wiki_json.New_dflt();
json.Name_(name);
json.Mainpage_(mainpage_name);
db_mgr.Tbl__wiki().Upsert(id, domain, fil_url, json.To_str(json_wtr));
if (itm_is_new) {
@ -65,6 +68,17 @@ class Xowdir_item_mgr {
app.Gui__cbk_mgr().Send_redirect(cbk_trg, "/site/" + domain + "/wiki/" + mainpage_name);
}
else {
if (old_item != null) {
// try to move file into new dir
// COMMENTED: need to be able to close all connections else move will fail
//Io_url old_fil = old_item.Url();
//String old_dir = old_fil.OwnerDir().Raw();
//if (!String_.Eq(old_dir, dir_str)) {
// Io_url new_fil = dir_url.GenSubFil(old_fil.NameAndExt());
// Io_mgr.Instance.MoveFil(old_fil, new_fil);
//}
}
// navigate back to wiki_directory
app.Gui__cbk_mgr().Send_redirect(cbk_trg, "/site/home/wiki/Special:XowaWikiDirectory");
}
@ -82,8 +96,9 @@ class Xowdir_item_mgr {
// navigate back to wiki_directory
app.Gui__cbk_mgr().Send_redirect(cbk_trg, "/site/home/wiki/Special:XowaWikiDirectory");
}
private String Validate(Xoa_app app, Xowdir_db_mgr db_mgr, String domain, String name, Io_url dir_url, String mainpage_name) {
private String Validate(Xoa_app app, Xowdir_db_mgr db_mgr, boolean itm_is_new, String domain, String name, Io_url dir_url, String mainpage_name) {
// domain
if (itm_is_new) {
if (String_.Len_eq_0(domain))
return "Domain cannot be empty: " + domain;
if (db_mgr.Tbl__wiki().Select_by_key_or_null(domain) != null)
@ -91,7 +106,8 @@ class Xowdir_item_mgr {
if (String_.Len(domain) > 63)
return "Domain must be 63 characters or less: " + domain;
if (!Is_valid_domain_name(Bry_.new_u8(domain)))
return "Domain is invalid; can only have letters, numbers, or a dot. If a dash exists, it cannot be at the start or the end: " + domain ;
return "Domain is invalid; can only have letters, numbers, or a dot. If a dash exists, it cannot be at the start or the end: " + domain;
}
// name
if (String_.Len_eq_0(name))
@ -103,11 +119,17 @@ class Xowdir_item_mgr {
String dir_str = dir_url.Raw();
if (String_.Len_eq_0(dir_str))
return "Folder cannot be empty: " + dir_str;
// try to create fil
Io_mgr.Instance.CreateDirIfAbsent(dir_url);
if (!Io_mgr.Instance.ExistsDir(dir_url))
Io_url tmp_fil = dir_url.GenSubFil("xowa.temp.txt");
Io_mgr.Instance.SaveFilStr(tmp_fil, "temp");
if (!String_.Eq(Io_mgr.Instance.LoadFilStr(tmp_fil), "temp"))
return "Folder could not be created: " + dir_str;
Io_mgr.Instance.DeleteFil(tmp_fil);
// mainpage_name
if (itm_is_new) {
byte[] mainpage_name_bry = Bry_.new_u8(mainpage_name);
Xoa_ttl ttl = Xoa_ttl.Parse(app.User().Wikii(), mainpage_name_bry);
if (ttl == null)
@ -117,6 +139,7 @@ class Xowdir_item_mgr {
byte[] ucase_1st = app.User().Wikii().Lang().Case_mgr().Case_build_1st_upper(tmp, mainpage_name_bry, 0, mainpage_name_bry.length);
if (!Bry_.Eq(mainpage_name_bry, ucase_1st))
return "Main Page must start with an uppercase letter.";
}
// valid returns null
return null;

4
400_xowa/src/gplx/xowa/guis/cmds/Xog_cmd_itm_.java
View File

@ -50,8 +50,8 @@ public class Xog_cmd_itm_ {
, Key_nav_system_data_cfg_lang = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.system_data.cfg_lang" , "Special:XowaSystemData?type=cfg_lang")
, Key_nav_system_data_usr_history = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.system_data.usr_history" , "Special:XowaSystemData?type=usr_history")
, Key_nav_personal_item = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.personal.item" , "Special:XowaWikiItem")
, Key_nav_personal_list = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.personal.list" , "Special:XowaWikiDirectory")
, Key_nav_personal_item = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.personal.item" , "home/wiki/Special:XowaWikiItem")
, Key_nav_personal_list = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.personal.list" , "home/wiki/Special:XowaWikiDirectory")
, Key_gui_font_increase = new_dflt_(Xog_ctg_itm_.Tid_font , "xowa.gui.font.increase")
, Key_gui_font_decrease = new_dflt_(Xog_ctg_itm_.Tid_font , "xowa.gui.font.decrease")