From e3e57554c630132f3a9a351b359c07256678ab28 Mon Sep 17 00:00:00 2001 From: Tom Price Date: Thu, 22 Jan 2015 19:26:16 +0000 Subject: [PATCH] Fixed issue with item modals not displaying. Moved item modal code to an includable file. --- RIGS/static/js/interaction.js | 4 ++ RIGS/templates/RIGS/event_form.html | 68 +------------------------ RIGS/templates/RIGS/item_modal.html | 74 ++++++++++++++++++++++++++++ RIGS/templates/RIGS/item_row.html | 1 + db.sqlite3 | Bin 19215360 -> 19217408 bytes 5 files changed, 80 insertions(+), 67 deletions(-) create mode 100644 RIGS/templates/RIGS/item_modal.html diff --git a/RIGS/static/js/interaction.js b/RIGS/static/js/interaction.js index 933179da..7d2617f4 100644 --- a/RIGS/static/js/interaction.js +++ b/RIGS/static/js/interaction.js @@ -42,6 +42,8 @@ $('#item-table').on('click', '.item-add', function () { $('#item_description').val(''); $('#item_quantity').val(''); $('#item_cost').val(''); + + $($(this).data('target')).modal('show'); }); $('#item-table').on('click', '.item-edit', function () { @@ -55,6 +57,8 @@ $('#item-table').on('click', '.item-edit', function () { $('#item_description').val(fields.description); $('#item_quantity').val(fields.quantity); $('#item_cost').val(fields.cost); + + $($(this).data('target')).modal('show'); }); $('body').on('submit', '#item-form', function (e) { diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html index 9349463b..1701cdb1 100644 --- a/RIGS/templates/RIGS/event_form.html +++ b/RIGS/templates/RIGS/event_form.html @@ -346,71 +346,5 @@ - + {% include 'RIGS/item_modal.html' %} {% endblock %} \ No newline at end of file diff --git a/RIGS/templates/RIGS/item_modal.html b/RIGS/templates/RIGS/item_modal.html new file mode 100644 index 00000000..602f24ef --- /dev/null +++ b/RIGS/templates/RIGS/item_modal.html @@ -0,0 +1,74 @@ + \ No newline at end of file diff --git a/RIGS/templates/RIGS/item_row.html b/RIGS/templates/RIGS/item_row.html index 1ceb6f9f..fd240fc5 100644 --- a/RIGS/templates/RIGS/item_row.html +++ b/RIGS/templates/RIGS/item_row.html @@ -1,3 +1,4 @@ + {{ item.name }} diff --git a/db.sqlite3 b/db.sqlite3 index 682df3bafe9f411aa533cee19a4983f16c22b418..fea6c73809a4ab51a0d61413523fa4beebe86363 100644 GIT binary patch delta 2464 zcmY+_d013c7zXh3oqGpnfI(1EmOD7CW-Q`}s7QpGJF>Y}kSL(w5@uPJMKEJdi;4RM zvo6|RYFHZC;#DKtRTKdwQp?J+MU#w5srQVxo~J*4@B7W=4jj&TW^U#A4VKET4VE=w zG=7&d-#4_iZ=f`YFDbdVWXauS<#*1)R3?VFZdaYJyUv$@g9I{|zze*=3>NSKajzd( z!5?}+00cr$=motY2>L)@2!;>{g)mUS2I0^T><|Hw5Czc?1F_H_Zh!%BBg8>GBtRkz zgd`XQ4j2r{Fa%OyC=6?;^BrECBQK>ctvUxEipL_g1|MhL5BUb?2Vw zaqjAZ;gAX=APsJ6s4hrfvdNn#u{0jc)Ev84v>M-;ZdFHgrjKu^>P&x)WX71;oqQ!7 zZiWmP38P>%+yY}@ER2KkFaajQB*=uxkOkS0(~x{6_vjF5Iz_48@p<8>==i*A7PG`9 zO9yi`yW9#{(Z!hNs|?uQ3pIXnmtK?OVvl~4sv zaKQ?A1Xh9@9)-u?ad-m68lQyKPz`HfEv$p}umLv0CQzXUYGE@x1zX^0cm_16gRQU) zo`vV&d3XU{gqPrDcm-aC?XUxO!fQ|uyWn+r19rn6coQ1nE!Ych!#nUUya)S0hy8E> z4#NA;2p_;9_z*sVkKq&e6h4E`;V>M5qtFD$;5anH321>Vi+vru=P4CemT1rQ#jn2{!beR^?Rc_+`ye}1TJFVdZxP#n$1iyt( zrV7omP@&nHhHOj`UoG+7%+=}{t}$1OXSm8-C&Z8-G1qa=z?tiqXCUTk(rXtfwBWF; zuu7)+6oyfXmY!y#2_Zugk_II>9QHx~|DuTN*7h$`C`jLfyRySnd3R}zTG!P-MmsRm zMmFwh(#~Lr4Ry6%-xF7h(I<>PuJ6Y`pTQr#{@OXq=t84s8$HM9BBM);o@?|xqf3o0 zGkU(!3yfZ9^dh6nueU4Wb7MGc^iiXmj6Sw6-$wE>Ig7_Kb@7(b724zWND48f@I)S~ zuBkB<>hcL2MG{V*bG9n3TTg7UQH#Yqhw|_|nUJjpM903V9Xw;Bb$%1FobIW(IN9mW z(+khq=($)qOFYi9GFIhl#pZBw_|q~fr@2%>Q)v<&aH}&`*|kRe#FhH*xyE7eoU0f- z=PHI~ahziC9IzNX2P}rB>MBb(A^M51i--^rNqUtfidL?+aH)v@!C&BZJ)kCv{CNmt zReXIx2)oH@C87vhgl#Zm305o9b_T^zX|=XFigayrG?kRe1Ly)%)9UyrZK525H`9fN zz)ag((rWX=$d9`9E>jHo-RL8+%ZzvNKJ2m@*w*VClQUdw!`8D3DdZj3T~*+8=W0>E zDAdleja`lyGLxSbo5m!4#x+ zM2^f-GuDp|R|j5c_gAyq9n-YZLki6he`2oFJw-ctQlWGHaoyrqOKc$H2dGjFxW}vC r+8o*B%yhbE=+m1OnkW|KOmn)Y>y3vMO7*-4) delta 2031 zcmXxkc~}&69LMqb{$^moMM6ArcX5?NRHQN_NJ3JxC{a8zD+m-k@T%ydi#UocGa)r6 z)EqR!QcJ7|J7mks?xIpMveN8OEXyLovg19u{qcH#e$UMQF}u&RQ{KHgwEXDm&{~&d z?sPA74s7k;OFvhY%)Mo9$&JO=EzRdtY#&DaRaNiw)jI_WIt&CM7!HIW6g^;nHVi!x zjl#33F-k$_Q z3g;miqmhF1k=k7EOe@N1Hp0mdL57dF@AWt6OO zXqtAR8lagu-r!g>u`{EmoMWbTW@I&2b!I#zhC^4%m)wDtgfQvB^m*7%l z;WAu~Nyx@zOhHa_a@W+>(fSpVXgU(7MVmttr=5N%$LUKPIStb>16N=suEZ={g{yH5 za*>B?k&gn*#vBwjCyp#SuxC)XG-`UAzFn`>XX#10q1siWs#dvblnRl9V)e?25zF)* z=zYT1c(Mp{F%R>x0L55{MOcg_Sc>a#J#Ih=Zp2Nv8Mok8l;SqrjyrHC?m`*vMmZ`_ zi7MQKdr=J^?!*09h6k`54`KysP>YAK605Kp4`U5XJc2r`#X79Vqu2lo_1K6_cnq8I zI2y18PvA*x#WrlmQ+OIX(1@LQ2G8O-G~szPV;5e)i+BkyV>eph$18Xhd+-`w#~av- zH}MwU#yfZy@8NxXfDh4%kMJ=*!9MIq8$QJWe1>*>j)V9DU*anq!eM-kBlrg2;yZkg zqd0~R9LEp%5hw5ye#S}sf?v^z-_V8M(T!911ApQ){=(n*=YhtP;)krs?|D?yChl|S zqK9b}#WmBXDj~WZ!%mQ$U^@;wA$CIT^swW!6K1EUop3v6*@>{z%TA=7-gf%f>1(H- zo&I(P*ohMV^r-`7XPG`|(B9Rv^_hCUwSg;d zSSOacCBJ6D3hctb76*1gVCM&RUSQ`2wlJ`B0y{gf z1%b^!vlYhz+wtF8@1O6M^Zx(cI{n_OJd&weay?>{8rdpIGp}DizRX(Y9U@VBib^u; z2P78xgZF#HDd^V+H=SwE5jn2Dt&317WsCi zFV$ag*dv?cjZ36LGbd**&$Ws|qGgm>p1C~9dYxmH_3b>5jIF5-jTSPAetc?+W!`fK6w%ACJZp}=uSL3Y9 xj5rB5H