FSN#27548 Notities nog (even) kunnen wijzigen

svn path=/Website/trunk/; revision=19738
This commit is contained in:
Erik Groener
2013-11-06 12:43:23 +00:00
parent 14bf227910
commit 14c007dd1d
5 changed files with 9 additions and 21 deletions

View File

@@ -45,7 +45,6 @@ user.auth_required_or_abort(this_cnt.canReadNotes);
var buttons = [];
if (this_cnt.canWriteNotes)
{
var isAppending = true;
var sql = "SELECT cnt_contract_note_key, prs_perslid_key"
+ " FROM cnt_contract_note"
+ " WHERE cnt_contract_key =" + cnt_key
@@ -55,13 +54,11 @@ user.auth_required_or_abort(this_cnt.canReadNotes);
{
if (oRs("prs_perslid_key").value == user_key)
{
isAppending = false;
buttons.push({title: L("lcl_cnt_note_edit"), icon: "wijzigen.png", action: "cnt_notechange("+oRs("cnt_contract_note_key").value+")", id: "bedit_cnt_note"});
}
}
oRs.Close();
if (isAppending)
buttons.push({title: L("lcl_cnt_note_append"), icon: "plus.png", action: "cnt_notechange()", id: "bchange_cnt_note"});
buttons.push({title: L("lcl_cnt_note_append"), icon: "plus.png", action: "cnt_notechange()", id: "bchange_cnt_note"});
}
sql = "SELECT n.cnt_contract_note_aanmaak"

View File

@@ -74,8 +74,6 @@ if (fin_key > 0)
var buttons = [];
if (fin_key > 0 && this_fin.canWriteNotes) // Manual add allowed
{
var isAppending = true;
var sql = "SELECT fin_factuur_note_key, prs_perslid_key"
+ " FROM fin_factuur_note"
+ " WHERE fin_factuur_key =" + fin_key
@@ -85,13 +83,11 @@ if (fin_key > 0)
{
if (oRs("prs_perslid_key").value == user_key)
{
isAppending = false;
buttons.push({title: L("lcl_fin_note_edit"), icon: "wijzigen.png", action: "fin_notechange("+oRs("fin_factuur_note_key").value+")", id: "bedit_fin_note"});
}
}
oRs.Close();
if (isAppending)
buttons.push({title: L("lcl_add"), icon: "plus.png", action:"fin_notechange()", id:"bchange_fin_note" });
buttons.push({title: L("lcl_add"), icon: "plus.png", action:"fin_notechange()", id:"bchange_fin_note" });
}
if (fin_key > 0)

View File

@@ -230,13 +230,16 @@ FCLTHeader.Requires({ plugins: [] });
var cnt = rst.processResultset();
var note_oms = "";
var note_zichtbaar = (mld_info.fenotes & 1);
if (note_key > -1)
{
sql = "SELECT mld_melding_note_omschrijving"
+ " , mld_melding_note_flag"
+ " FROM mld_melding_note"
+ " WHERE mld_melding_note_key = " + note_key;
var oRs = Oracle.Execute(sql);
note_oms = oRs("mld_melding_note_omschrijving").value;
note_zichtbaar = oRs("mld_melding_note_flag").value == 1;
}
%>
</div>
@@ -246,9 +249,9 @@ FCLTHeader.Requires({ plugins: [] });
if (mld_info.fenotes & 2 && !mfe.haveOnlyFErights)
{
if (note_key == -1)
RWCHECKBOXTR("zichtbaarFE", "fldmldzichtbaarFE", "<nobr>" + L("lcl_mld_zichtbaar_FE") + "</nobr>", (mld_info.fenotes & 1), {html: "" });
RWCHECKBOXTR("zichtbaarFE", "fldmldzichtbaarFE", "<nobr>" + L("lcl_mld_zichtbaar_FE") + "</nobr>", note_zichtbaar, {html: "" });
else
ROCHECKBOXTR("fldmldzichtbaarFE", "<nobr>" + L("lcl_mld_zichtbaar_FE") + "</nobr>", (mld_info.fenotes & 1), {html: "" });
ROCHECKBOXTR("fldmldzichtbaarFE", "<nobr>" + L("lcl_mld_zichtbaar_FE") + "</nobr>", note_zichtbaar, {html: "" });
}
%>
</table>

View File

@@ -97,8 +97,6 @@ cache.whenNoRecords("SELECT 1 FROM mld_melding_note WHERE mld_melding_key = " +
if (mfe.canWriteNotes)
{
var isAppending = true;
var sql = "SELECT mld_melding_note_key, prs_perslid_key"
+ " FROM mld_melding_note"
+ " WHERE mld_melding_key =" + mld_key
@@ -108,13 +106,11 @@ cache.whenNoRecords("SELECT 1 FROM mld_melding_note WHERE mld_melding_key = " +
{
if (oRs("prs_perslid_key").value == user_key)
{
isAppending = false;
buttons.push({title: L("lcl_change"), icon: "wijzigen.png", action: "mld_notechange("+oRs("mld_melding_note_key").value+")", id: "bedit_mld_note"});
}
}
oRs.Close();
if (isAppending)
buttons = [ {title: L("lcl_add"), icon: "plus.png", action:"mld_notechange()", id:"bchange_mld_note" } ];
buttons.push({title: L("lcl_add"), icon: "plus.png", action:"mld_notechange()", id:"bchange_mld_note" });
}
// Zelfde query in mld_edit_note.asp

View File

@@ -67,8 +67,6 @@ lcl.set_dialect(mld_opdr.opdr_type, "MLD_TYPEOPDR_KEY");
if (this_opdr.canEditOpdrNote) // Manual allowed
{
var isAppending = true;
var sql = "SELECT mld_opdr_note_key, prs_perslid_key"
+ " FROM mld_opdr_note"
+ " WHERE mld_opdr_key =" + opdr_key
@@ -78,13 +76,11 @@ lcl.set_dialect(mld_opdr.opdr_type, "MLD_TYPEOPDR_KEY");
{
if (oRs("prs_perslid_key").value == user_key)
{
isAppending = false;
buttons.push({title: L("lcl_change"), icon: "wijzigen.png", action: "opdr_notechange("+oRs("mld_opdr_note_key").value+")", id: "bedit_opdr_note"});
}
}
oRs.Close();
if (isAppending)
buttons = [ {title: L("lcl_add"), icon: "plus.png", action:"opdr_notechange()", id:"bchange_opdr_note" } ];
buttons.push({title: L("lcl_add"), icon: "plus.png", action:"opdr_notechange()", id:"bchange_opdr_note" });
}
sql = "SELECT n.mld_opdr_note_aanmaak"