merged 1.5.0 branch into 1.5.0-DB

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0-DB@8547 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-06-29 15:36:09 +00:00
parent 4973c78fbc
commit 01d0925dd5
145 changed files with 990 additions and 31147 deletions

View file

@ -16,7 +16,7 @@
<condition operation="equal" column="doc.module_srl" var="module_srl" filter="number" />
<condition operation="notin" column="doc.module_srl" var="except_module_srls" pipe="and" />
<condition operation="null" column="except_modules.module_srl" default="1" pipe="and" />
<condition operation="equal" column="doc.is_secret" default="N" pipe="and" />
<condition operation="equal" column="doc.status" default="PUBLIC" pipe="and" />
<condition operation="equal" column="modules.module_srl" default="doc.module_srl" filter="number" pipe="and" />
<condition operation="notin" column="modules.module_srl" var="except_modules" filter="numbers" pipe="and" />
<condition operation="more" column="doc.last_update" var="start_date" filter="number" pipe="and" />

View file

@ -1,5 +1,5 @@
function insertSelectedModules(id, module_srl, mid, browser_title) {
var sel_obj = xGetElementById('_'+id);
var sel_obj = get_by_id('_'+id);
for(var i=0;i<sel_obj.options.length;i++) if(sel_obj.options[i].value==module_srl) return;
var opt = new Option(browser_title+' ('+mid+')', module_srl, false, false);
sel_obj.options[sel_obj.options.length] = opt;
@ -9,7 +9,7 @@ function insertSelectedModules(id, module_srl, mid, browser_title) {
}
function removeExceptModule(id) {
var sel_obj = xGetElementById('_'+id);
var sel_obj = get_by_id('_'+id);
sel_obj.remove(sel_obj.selectedIndex);
if(sel_obj.options.length) sel_obj.selectedIndex = sel_obj.options.length-1;
doSyncExceptModules(id);
@ -17,11 +17,11 @@ function removeExceptModule(id) {
function doSyncExceptModules(id) {
var selected_module_srls = new Array();
var sel_obj = xGetElementById('_'+id);
var sel_obj = get_by_id('_'+id);
for(var i=0;i<sel_obj.options.length;i++) {
selected_module_srls.push(sel_obj.options[i].value);
}
xGetElementById(id).value = selected_module_srls.join(',');
get_by_id(id).value = selected_module_srls.join(',');
}