Commit daf7d84b972b0f4ef2a35fcf9b48101417a7110d
1 parent
9cd7cf9c
fix the faulty merge
Showing
1 changed file
with
0 additions
and
4 deletions
Show diff stats
database/vtm/view_table_renderer.anubis
| ... | ... | @@ -205,12 +205,8 @@ public define HTML_Partial_Content |
| 205 | 205 | partial_content( |
| 206 | 206 | div( [/*class("tableau")*/], |
| 207 | 207 | sequence( |
| 208 | -<<<<<<< HEAD | |
| 209 | 208 | [ |
| 210 | 209 | partial(jquery_button(jQuery_button(button, "edit_table_"+rows.table_name, "", _T("NEW"), jQuery_actioner(same, jqlink, "edit_table&table_name="+rows.table_name)))), |
| 211 | -======= | |
| 212 | - [ partial(jquery_button(jQuery_button(button, "", _T("NEW"), jQuery_actioner(same, jqlink, "table_name"), jq_icon_none, jq_icon_none)))/*actioner(same,same, link([class("my_button")],_T("NEW")),"edit_table",[("table_name", rows.table_name)])*/, | |
| 213 | ->>>>>>> 50b6dd00541faf76383aa5ad807b547c3f882842 | |
| 214 | 210 | //dialog used by datatable entries |
| 215 | 211 | partial(jq_dialog_create(dialog_id(action_name+"_dlg_ajax"), ajax("?a=ajax_edit_table&table_name="+rows.table_name))), |
| 216 | 212 | ... | ... |