Changeset 621
- Timestamp:
- 02.07.2009 17:23:05 (3 years ago)
- Location:
- ZMS/trunk
- Files:
-
- 9 edited
-
changes.txt (modified) (1 diff)
-
dtml/ZMSSqlDb/input_form.dtml (modified) (6 diffs)
-
dtml/javascript/comlib.dtml (modified) (1 diff)
-
dtml/objattrs/f_select_object.dtml (modified) (1 diff)
-
dtml/object/manage_page_header.dtml (modified) (1 diff)
-
dtml/object/manage_tabs.dtml (modified) (1 diff)
-
import/zmssqldb/cd.model.xml (modified) (2 diffs)
-
import/zmssqldb/zgadfly.cd.sql (modified) (1 diff)
-
version.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
ZMS/trunk/changes.txt
r613 r621 1238 1238 [01205] Applied fix for links to unknown content-objects in multi-sites (reported by IAS). 1239 1239 -------------------------------------------------- 1240 2009-06-30:zms-2.11.1-71 1241 [01206] Applied fix for SQL-Datasource: make lazy multiselects mor lazy (reported by ROC). 1242 [01207] Text editing bug with IE8: Text selection impossible (contributed by fh). 1243 -------------------------------------------------- -
ZMS/trunk/dtml/ZMSSqlDb/input_form.dtml
r590 r621 23 23 24 24 <dtml-call "REQUEST.set('row',record)" 25 ><dtml-call "REQUEST.set('entity_',REQUEST.get('entity'))" 25 26 ><dtml-call "REQUEST.set('entity',SESSION[sessqentitykey])"><dtml-if ZMS_ENTITY><dtml-call "REQUEST.set('entity',ZMS_ENTITY)"></dtml-if 26 27 ><dtml-call "REQUEST.set('css','form-element')"><dtml-if ZMS_CSS_EXTRA><dtml-call "REQUEST.set('css',css+' '+ZMS_CSS_EXTRA)"></dtml-if 27 28 ><dtml-call "REQUEST.set('qexcludeids',[])"><dtml-if ZMS_EXCLUDE_IDS><dtml-call "REQUEST.set('qexcludeids',ZMS_EXCLUDE_IDS)"></dtml-if 28 29 ><dtml-call f_recordset_init 30 ><dtml-let row_=row 29 31 30 32 ><dtml-unless "REQUEST.get('f_zmiInputFormJavaScript')" … … 275 277 ><dtml-call "sqlStatement.append(' LEFT OUTER JOIN '.join(outerjoins))" 276 278 ></dtml-if 277 ><dtml-call "sqlStatement.append(' WHERE '+multimultiselect.get('tablename')+'.'+multimultiselect.get('fk')+'='+sql_quote__(entity,primary_key,row .get('id','')))"279 ><dtml-call "sqlStatement.append(' WHERE '+multimultiselect.get('tablename')+'.'+multimultiselect.get('fk')+'='+sql_quote__(entity,primary_key,row_.get('id','')))" 278 280 ><dtml-call "REQUEST.set('sqlStatement',''.join(sqlStatement))" 279 281 ><!-- input_form.dtml.SQL: <dtml-var sqlStatement> --> … … 515 517 <dtml-call "REQUEST.set('sqlStatement',[])"> 516 518 <dtml-call "sqlStatement.append('SELECT ' + dst['id'] + ' AS dst_id FROM ' + intersection['id'] + ' ')"> 517 <dtml-call "sqlStatement.append('WHERE ' + src['id'] + '=' + sql_quote__(entity,primary_key,row .get(primary_key)))">519 <dtml-call "sqlStatement.append('WHERE ' + src['id'] + '=' + sql_quote__(entity,primary_key,row_.get(primary_key)))"> 518 520 <dtml-try> 519 521 <!-- MULTISELECT.SQL.INTERSECTION: <dtml-var "''.join(sqlStatement)"> --> … … 527 529 </dtml-try> 528 530 </dtml-unless> 529 <dtml-let fk="dst['fk']" maxlen="_.int(fk.get('maxlen',25))"> 530 <dtml-call "REQUEST.set('sqlStatement',[])"> 531 <dtml-call "sqlStatement.append('SELECT ' + fk.get('fieldname') + ' AS qkey, ' + fk.get('displayfield') + ' AS qvalue ')"> 532 <dtml-call "sqlStatement.append('FROM ' + fk.get('tablename') + ' ')"> 533 <dtml-if "fk.has_key('sort')"> 534 <dtml-call "sqlStatement.append( 'ORDER BY ' + fk.get('sort'))"> 535 <dtml-else> 536 <dtml-call "sqlStatement.append( 'ORDER BY 2 ')"> 537 </dtml-if> 538 <dtml-call "REQUEST.set('optpl',[])"> 539 <dtml-try> 531 <dtml-let fk="dst['fk']" maxlen="_.int(fk.get('maxlen',25))" 532 ><dtml-call "REQUEST.set('sqlStatement',[])" 533 ><dtml-call "sqlStatement.append('SELECT ' + fk.get('fieldname') + ' AS qkey, ' + fk.get('displayfield') + ' AS qvalue ')" 534 ><dtml-call "sqlStatement.append('FROM ' + fk.get('tablename') + ' ')" 535 ><dtml-if "multiselect.has_key('lazy')" 536 ><dtml-let where="[]" 537 ><dtml-in value 538 ><dtml-call "where.append(fk.get('fieldname')+'='+sql_quote__(fk.get('tablename'),fk.get('fieldname'),_['sequence-item']))" 539 ><dtml-else 540 ><dtml-call "where.append('1=0')" 541 ></dtml-in 542 ><dtml-if where 543 ><dtml-call "sqlStatement.append('WHERE ' + ' OR '.join(where) + ' ')" 544 ></dtml-if 545 ></dtml-let 546 ></dtml-if 547 ><dtml-if "fk.has_key('sort')" 548 ><dtml-call "sqlStatement.append( 'ORDER BY ' + fk.get('sort'))" 549 ><dtml-else 550 ><dtml-call "sqlStatement.append( 'ORDER BY 2 ')" 551 ></dtml-if 552 ><dtml-call "REQUEST.set('optpl',[])" 553 ><dtml-try> 540 554 <!-- MULTISELECT.SQL.FOREIGNTABLE: <dtml-var "''.join(sqlStatement)"> --> 541 555 <dtml-in "query(''.join(sqlStatement))['records']" … … 552 566 </dtml-try> 553 567 <dtml-if "multiselect.has_key('lazy')"> 554 <select class="<dtml-var css>" id="<dtml-var elName>" name="<dtml-var "'%s:list'%elName">" multiple="multiple" size="5"> 555 <dtml-in optpl> 556 <dtml-let i=sequence-item k="i[0]" v="i[1]"> 557 <dtml-if "_.str(k) in value"> 558 <option value="<dtml-var k>"><dtml-if v><dtml-var v><dtml-else>None</dtml-if></option> 559 </dtml-if> 560 </dtml-let> 561 </dtml-in> 562 </select> 568 <select class="<dtml-var css>" id="<dtml-var elName>" name="<dtml-var "'%s:list'%elName">" multiple="multiple" size="5" 569 ><dtml-in optpl 570 ><dtml-let i=sequence-item k="i[0]" v="i[1]" 571 ><option value="<dtml-var k>"><dtml-if v><dtml-var v><dtml-else>None</dtml-if></option 572 ></dtml-let 573 ></dtml-in 574 ></select> 563 575 <input class="form-submit" type="submit" value="..." title="<dtml-var "getZMILangStr('ACTION_SELECT')%getLangStr(label,lang)">" onclick="return browseDbBtnClick('form0','<dtml-if ZMS_TABLE_PREFIX><dtml-var ZMS_TABLE_PREFIX>_</dtml-if>','<dtml-var id>','<dtml-var "js_quote(fk.get('fieldname'))">','<dtml-var "js_quote(fk.get('displayfield'))">','<dtml-var "js_quote(fk.get('tablename'))">')"/> 564 576 <input class="form-submit" type="submit" value="-" title="<dtml-var "getZMILangStr('BTN_DELETE')">" onclick="return multiMultiSelectRemoveElements('<dtml-var elName>')"/> … … 731 743 </form> 732 744 </dtml-unless> 745 746 <dtml-call "REQUEST.set('entity',REQUEST.get('entity_'))"> 747 </dtml-let> -
ZMS/trunk/dtml/javascript/comlib.dtml
r562 r621 16 16 // ############################################################################# 17 17 function toggleElement( selector) { 18 if ($(selector).css("display")=='none') { 19 $(selector).show('fast'); 18 var els = $(selector); 19 if ( selector.indexOf("tr[")==0) { 20 if (els.css("visibility")=='hidden') { 21 els.css({'visibility':'visible','display':''}); 22 } 23 else { 24 els.css({'visibility':'hidden','display':'none'}); 25 } 20 26 } 21 27 else { 22 $(selector).hide('fast'); 28 if (els.css("display")=='none') { 29 els.show('fast'); 30 } 31 else { 32 els.hide('fast'); 33 } 23 34 } 24 35 return; 25 36 } 37 38 // ############################################################################# 39 // ### toggleImage: 40 // ############################################################################# 41 function toggleImage( selector) { 42 var els = $(selector); 43 if ( els.attr("title") == "-") { 44 els.attr( { src: "<dtml-var MISC_ZMS>pl.gif", title: "+"}); 45 } 46 else 47 if ( els.attr("title") == "+") { 48 els.attr( { src: "<dtml-var MISC_ZMS>mi.gif", title: "-"}); 49 } 50 return; 51 } 52 26 53 27 54 // ############################################################################# -
ZMS/trunk/dtml/objattrs/f_select_object.dtml
r464 r621 18 18 <dtml-if sequence-start> 19 19 <tr> 20 <td colspan="2" class="zmiNeutralColorLight1"><div class="form-label<dtml-if disabled>-disabled</dtml-if>"><dtml-var elLabel><dtml-if required><sup style="color:red">*</sup></dtml-if></div></td> 20 <td colspan="2" class="zmiNeutralColorLight1"> 21 <div class="form-label<dtml-if disabled>-disabled</dtml-if>"> 22 <a href="javascript:toggleElement('tr[id^=tr_<dtml-var "objAttr['id']">]');toggleImage('img[id=<dtml-var "objAttr['id']">_img]');"><img id="<dtml-var "objAttr['id']">_img" src="<dtml-var MISC_ZMS>mi.gif" border="0" title="-" align="absmiddle"></a> 23 <dtml-var elLabel><dtml-if required><sup style="color:red">*</sup></dtml-if> 24 </div> 25 </td> 21 26 </tr> 22 27 </dtml-if> -
ZMS/trunk/dtml/object/manage_page_header.dtml
r590 r621 62 62 <dtml-comment> 63 63 ################################################################################ 64 ### IE 7 Compatibilty Mode 65 ################################################################################ 66 </dtml-comment> 67 <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> 68 69 <dtml-comment> 70 ################################################################################ 64 71 ### CSS 65 72 ################################################################################ -
ZMS/trunk/dtml/object/manage_tabs.dtml
r403 r621 7 7 </dtml-unless> 8 8 <dtml-call "REQUEST.set('_mo',[])"> 9 <dtml-in my_manage_options >10 <dtml-if "not (_['sequence-item']['action'].find('manage_UndoVersionForm')>=0 and not getHistory())">9 <dtml-in my_manage_options mapping> 10 <dtml-if "not action.endswith('manage_UndoVersionForm') or getHistory() or not getAutocommit()"> 11 11 <dtml-call "REQUEST['_mo'].append(_['sequence-item'])"> 12 12 </dtml-if> -
ZMS/trunk/import/zmssqldb/cd.model.xml
r510 r621 75 75 </dictionary> 76 76 </item> 77 <item type="dictionary"> 78 <dictionary> 79 <item key="id">categories</item> 80 <item key="hide" type="int">1</item> 81 <item key="label">Categories</item> 82 <item key="multiselect" type="dictionary"> 83 <dictionary> 84 <item key="fk"><![CDATA[CD_ID]]></item> 85 <item key="lazy" type="int">1</item> 86 <item key="tablename"><![CDATA[CDHASCATEGORY]]></item> 87 </dictionary> 88 </item> 89 </dictionary> 90 </item> 77 91 </list> 78 92 </item> … … 205 219 ### CATEGORIES 206 220 ######################################## --> 207 <item> 208 <dictionary> 209 <item key="id">cdcategories</item> 210 <item key="label">Categories</item> 211 <item key="columns"> 212 <list> 213 <item> 214 <dictionary> 215 <item key="id">category_id</item> 216 <item key="hide" type="int">1</item> 217 <item key="label">Id</item> 218 <item key="type">int</item> 219 <item key="pk" type="int">1</item> 220 <item key="auto">insert</item> 221 </dictionary> 222 </item> 223 <item> 224 <dictionary> 225 <item key="id">category_name</item> 226 <item key="label">Name</item> 227 <item key="type">string</item> 228 </dictionary> 229 </item> 230 </list> 231 </item> 232 </dictionary> 233 </item> 221 <item> 222 <dictionary> 223 <item key="id">cdcategories</item> 224 <item key="label">Categories</item> 225 <item key="columns"> 226 <list> 227 <item> 228 <dictionary> 229 <item key="id">category_id</item> 230 <item key="hide" type="int">1</item> 231 <item key="label">Id</item> 232 <item key="type">int</item> 233 <item key="pk" type="int">1</item> 234 <item key="auto">insert</item> 235 </dictionary> 236 </item> 237 <item> 238 <dictionary> 239 <item key="id">category_name</item> 240 <item key="label">Name</item> 241 <item key="type">string</item> 242 </dictionary> 243 </item> 244 </list> 245 </item> 246 </dictionary> 247 </item> 248 <!-- ######################################## 249 ### CDHASCATEGORIES (INTERSECTION) 250 ######################################## --> 251 <item type="dictionary"> 252 <dictionary> 253 <item key="filter"></item> 254 <item key="id"><![CDATA[CDHASCATEGORY]]></item> 255 <item key="interface"></item> 256 <item key="label"><![CDATA[Cdhascategory]]></item> 257 <item key="type"><![CDATA[intersection]]></item> 258 <item key="columns" type="list"> 259 <list> 260 <item type="dictionary"> 261 <dictionary> 262 <item key="id">CD_ID</item> 263 <item key="label">Cd Id</item> 264 <item key="fk" type="dictionary"> 265 <dictionary> 266 <item key="displayfield"><![CDATA[CD_TITLE]]></item> 267 <item key="fieldname"><![CDATA[CD_ID]]></item> 268 <item key="tablename"><![CDATA[cds]]></item> 269 </dictionary> 270 </item> 271 </dictionary> 272 </item> 273 <item type="dictionary"> 274 <dictionary> 275 <item key="id">CATEGORY_ID</item> 276 <item key="label">Category Id</item> 277 <item key="fk" type="dictionary"> 278 <dictionary> 279 <item key="displayfield"><![CDATA[CATEGORY_NAME]]></item> 280 <item key="fieldname"><![CDATA[CATEGORY_ID]]></item> 281 <item key="tablename"><![CDATA[cdcategories]]></item> 282 </dictionary> 283 </item> 284 </dictionary> 285 </item> 286 </list> 287 </item> 288 </dictionary> 289 </item> 234 290 <!-- ######################################## --> 235 291 </list> -
ZMS/trunk/import/zmssqldb/zgadfly.cd.sql
r562 r621 22 22 insert into cdcompanies (company_id, company_name) values ( 'SOE', 'Sony Entertainment'); 23 23 insert into cdcompanies (company_id, company_name) values ( 'ARI', 'Ariola'); 24 create table cdhascategory (cd_id integer, category_id integer); -
ZMS/trunk/version.txt
r613 r621 1 ZMS 2.11.1-7 01 ZMS 2.11.1-71
Note: See TracChangeset
for help on using the changeset viewer.
