From 9442736518c1364e9563e444fa9b93e9cf9fd0ff Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 21 Jun 2018 09:35:04 -0700
Subject: [PATCH] Adds textarea as a custom field type

---
 app/Helpers/Helper.php                        |   2 +-
 app/Models/CustomField.php                    |   1 +
 public/js/build/all.js                        | Bin 812776 -> 812950 bytes
 public/js/build/vue.js                        | Bin 676606 -> 676780 bytes
 public/js/build/vue.js.map                    | Bin 698421 -> 698609 bytes
 public/js/dist/all.js                         | Bin 812776 -> 812950 bytes
 public/mix-manifest.json                      |   8 ++++----
 .../asset-models/fieldset-default-values.vue  |   2 ++
 resources/macros/macros.php                   |   1 +
 .../views/custom_fields/fields/edit.blade.php |   4 ++--
 .../views/models/custom_fields_form.blade.php |   5 +++++
 resources/views/models/edit.blade.php         |   3 +--
 12 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 87c8216320..0ba7d03c01 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -413,7 +413,7 @@ class Helper
     {
         $keys = array_keys(CustomField::$PredefinedFormats);
         $stuff = array_combine($keys, $keys);
-        return $stuff+["" => trans('admin/custom_fields/general.custom_format')];
+        return $stuff;
     }
 
     /**
diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php
index ad9a2ab36a..4ea44fef90 100644
--- a/app/Models/CustomField.php
+++ b/app/Models/CustomField.php
@@ -16,6 +16,7 @@ class CustomField extends Model
     public $guarded=["id"];
     public static $PredefinedFormats=[
         "ANY" => "",
+        "CUSTOM REGEX" => "",
         "ALPHA" => "alpha",
         "ALPHA-DASH" => "alpha_dash",
         "NUMERIC" => "numeric",
diff --git a/public/js/build/all.js b/public/js/build/all.js
index 3767ea093fed0dc5f559b26bd9cff0fa3a3fc46d..7d23ff6e62f1f87565d3bbf608eb143ebde19eab 100644
GIT binary patch
delta 789
zcmYL{Ur19?9LKr$p0j)I-7L-2Wl4G^RG8`fZ#GR6GPTmFGbGKmd$k#EI`7=voC*<9
z5>$rg!I0j3h)kGyD9H4oOiVNp0#P5V2MH=91%rt04a~>S_xJmL&yO!>bKW?(U>qBX
zG^To+Wg*EBXEZdq9X8qSbR^12etV)|6+7HQQotaHR@s`|nVccoax-#rv++U~h#A<4
z`~wBmOWv5#LncO+yt36LSp}0xIw^OxNd-#8o`@@}Pz3I?AQm@-@*Hg!acT{UAirzS
zV=DMFs`)C#2kSh8Fu2uS>tT4O15dNs@WC`48x*&1!Qj_l=^lzFG40fQh%fY0EKWN}
zg->{>C`HC$VcIb=^PSQ|vKFab4<VBjZG(*GQW>5yqZSg0XrE27-@ieZL9*ILKU2f*
zY|<5wtbC&%spOEDR%O=0RC*Ok{>+#m>Dy#R)LB9!ut3ry0p|hI?goAU)Nb%}J|7KQ
zYb@S@GkUW=-6mP3Y-5vPa2VoJ4gP>q-L-6&{BI2}7V<nf>;pPc$%|bFB>*oDKn-zj
zfGRJ?=eZ==?Q+E8!YfcuHtJvqz@z<IM0OisP(A4BC%8?MCo6EgOQGs&O*w;)w`w4c
z?a?4ITB{jS_46M!OEfvQtcmj}WV*=Sqsd$ads(IUIrc71M(5d9m5!F6J{mu_un3PC
z5W=s^5l3E>B8Y%=*6hPu9UzM=)uKr!c`$=STCwcRBGE_cin)6<%XeB`v33()Jk9Cx
z!VnjM=Sw-3#GT{Hdx_&6H>?_Tv)pnMqx7Su6{G+E$0URNeYz=w-hJZTpfq}Kv)=Eq
zi}LkTnVBa70l^>$^<*`Lw}<1<VZh?C+h7M574wP8Q!T~(vY!-8@eHL<(KP?XPZCVp
sFqLxhwG)2)<E3^@fe){=N4hZ`qC13lvvlJ$pNAV~89jNMt&30j3yka!1^@s6

delta 695
zcmYL`Z%9*N6vnytzT3UK+k_bD5>33#aCBw6+H@odrKx0O4z)>G=>DX`wzADTH>aX~
zD}`A4eu?}N7(%dEc|fBwD2)C{WfDXZ5$cDmumY9H?rW4Ef6sZ&InR0D;TdV^xs(`9
zmE3!LHG)~pmPBvJ?+UgC{JBAMv^7_#Xpx+PIVKA3reITEM_!@VX7zgQc3d4pnem^g
zzmq+gr%xppyM|R1pN#b#m+62XOT}6P{<;^j@vQZf<i?sziX9sTGK_Ul(+WU)7bVH~
z{x)p_YJX5hBDJki2Mmm|4<|w>9o2>Momg@)4x?4F+P!X1z99O=Y^xZJDS0a7>MDHM
z%KNZ>UBlt+5?=?hp3Zc^&{?{QjQbFxZ^|&ZOdlgOzd~P;ar7R;L(IpxHVpx$CJgyY
zjDygHWoA?c(Szy<_4!aB<!=PNg)ig&pWR^LOSWjl!uM>^ZYzH{{hzZjD!00WE&FV?
zoLEc{1)&kXgi$v_%|-1&a-j(_x{=Ne=8vcnDJ#z{poTC!J*mngwA!qi3}gKoDuBgz
zswrBLZp^E0cg8Ju)ZlWe%NdHtw-T%Y?w(K&b%NuK`V}#m-m0@BQ0`y{2)(Xloe@0p
zg3W-+8P-pv@t5qG2$+s=y@akG<#uvvVe|XRbG9Wt#vCST&#0i_VLi7RP&^ZlIX4Yi
zPdIl(q5e|M0FArTG-^mI*Yx%%5`Lt)MnmDWX4VUXR^DSE(JrE2@!l1LznAeQsu(}J
zgv@a85I+`G8a_YZ84A8l@t+9I?$>UkV4*}it`NRDp?wdLN$rj<1qN-pQao3r>sKZO
N=2#<~x9fIU{s0#W@`?Ze

diff --git a/public/js/build/vue.js b/public/js/build/vue.js
index 79892227b7eea088e974481b9adf2eb10aa0d52f..32880dc845273e628ce6a6ddcf4139797cb43e43 100644
GIT binary patch
delta 366
zcmeyjRCCR8%?*r9Mg|q>B}$q)iiSFArFqFEnfZAdC7RWl8cK;N#idG`wK_^Ei6x1;
zWx6IQ$(AM-mgY*+b#=I8Ci^q}V^soao_-*aMQVDF3|H{>W%eAZ%(5k^6(xy9sfkLq
zwyAn0l?AExK+|A?(;vR)6rIlhi&JEKvJ=O8#%5pU?Y_*6!f%<&{k^9jOk|M+85P(b
z`jHWcnYM?1WPX&leRm>DH47`qMOM=V^_j)kfhOjLhE+^&{J<C_X`Gyzm}+jArlgan
zqiCR0T?=$|l6g@HMD6qhMK0d<xHJ|ZW(8ul?Qv=B*KV{6xo~V3a^Z}-!3;8JtuB|D
zSWaqsYF<h-nun*iC$QLYz`Q^GYywL?f)|p=;w1%>i>)rtOex8*GBs7LtyR)dQi|Q4
JBf~Yx3;-cBcv=7e

delta 314
zcmZ3pT=U;j%?*r9EGgPqfzvnmF^fvLXBb8(Y1Zl}r6iUl>Xzx6rI{L}rCC@^Uzo)r
zJK3M<U-M0l?Ke3Xh2Jt|7*0Q!#UegkAc=*ACA8EiV)}bst{@2mLj#MnlvE=noje^y
z1D)zxplR;q{@&9SWx2AZ&wa+pF@32lS7`gTZ;U|9w0+w*=GHujeg|g`GqIf1^whkR
zXmtBuN^{w9z+Iy+!&Q&qZIj{hQi93FR+nd{lw??$nyS{;D(NUG#e%#O7OHPCIgv+Y
zI`?d5uI+iLEFLWFc3B|I3dC&N?XuYa-C$J$1q4u;)btD9%mJJCFl#Vxp2Y6X*ly#@
RvE9a*Gw#NAIa#hgGXU(}W=sG8

diff --git a/public/js/build/vue.js.map b/public/js/build/vue.js.map
index c5105e86379f959caa4d08045b16f52c80b68eb0..716291cc3ade520393c9cb1303dec6ae9a9e04af 100644
GIT binary patch
delta 326
zcmdmbLF?m1tqlcCECv<nCDR3(S;VChQ;JJtlr(E~Vw6%6OA>X<bWKu{Eln&e&8Isy
zv&d~e%*4mY5u*gs5Ti8xV?I~j_LXHEY0UB^sTC!OMX8A~O18GCdL@+wsrH!~F-kDu
z>5Z&R;?vi7bBS%AU&(QTvH2qN_KVDn%s-jS{k=iv<V-(R#=+Ho|1TpDGi|^BmpQtA
z`;j`9*(@v|H%&K`WEY?Qp^1fsB{wvzVtQRZSCp`Ea%y6#xnWw2l1`qEqJd6zt!8^{
zGYb&20x{e6*k<-?pIB0zgQ}+6PvEd@UsBDneMvQ^*B54x5g?)I<+Ut)9B?o8*0R_k
bc$aHg>JhxCIu<VkZ%rMG#P+xOTpktx6HarL

delta 291
zcmex(QETf3tqlcCEGgPqfzvuz#HHLb3?pKcG;4KYlu{B)5_QXT&C*N_($Xv}rW<y!
z$ZbB%#K+itkaPP%PDbXR%s|D{C+2ZUvxJr!MNHq2#}y@HU}#{GmXc}|qok9kqiCR0
zUE6+ui3y0Aw;y0)xls>MTG-EFIXxzyi;n|td{I7^9fG$bpQ|3hvoGNCLhvRQa7k>R
z(Zn*Fg(=B=`bR}p;pqonGqbfnXlDUpRv>2E{-B+G=O;FxCx9NCKCg*Idinz<rr^!4
xEE&w3GdUs{SyG*Ys-}aS(SEIpWBau#POmS_={bSZ7c{X*g4J%9EabXj4gf&XWF-Iq

diff --git a/public/js/dist/all.js b/public/js/dist/all.js
index 3767ea093fed0dc5f559b26bd9cff0fa3a3fc46d..7d23ff6e62f1f87565d3bbf608eb143ebde19eab 100644
GIT binary patch
delta 789
zcmYL{Ur19?9LKr$p0j)I-7L-2Wl4G^RG8`fZ#GR6GPTmFGbGKmd$k#EI`7=voC*<9
z5>$rg!I0j3h)kGyD9H4oOiVNp0#P5V2MH=91%rt04a~>S_xJmL&yO!>bKW?(U>qBX
zG^To+Wg*EBXEZdq9X8qSbR^12etV)|6+7HQQotaHR@s`|nVccoax-#rv++U~h#A<4
z`~wBmOWv5#LncO+yt36LSp}0xIw^OxNd-#8o`@@}Pz3I?AQm@-@*Hg!acT{UAirzS
zV=DMFs`)C#2kSh8Fu2uS>tT4O15dNs@WC`48x*&1!Qj_l=^lzFG40fQh%fY0EKWN}
zg->{>C`HC$VcIb=^PSQ|vKFab4<VBjZG(*GQW>5yqZSg0XrE27-@ieZL9*ILKU2f*
zY|<5wtbC&%spOEDR%O=0RC*Ok{>+#m>Dy#R)LB9!ut3ry0p|hI?goAU)Nb%}J|7KQ
zYb@S@GkUW=-6mP3Y-5vPa2VoJ4gP>q-L-6&{BI2}7V<nf>;pPc$%|bFB>*oDKn-zj
zfGRJ?=eZ==?Q+E8!YfcuHtJvqz@z<IM0OisP(A4BC%8?MCo6EgOQGs&O*w;)w`w4c
z?a?4ITB{jS_46M!OEfvQtcmj}WV*=Sqsd$ads(IUIrc71M(5d9m5!F6J{mu_un3PC
z5W=s^5l3E>B8Y%=*6hPu9UzM=)uKr!c`$=STCwcRBGE_cin)6<%XeB`v33()Jk9Cx
z!VnjM=Sw-3#GT{Hdx_&6H>?_Tv)pnMqx7Su6{G+E$0URNeYz=w-hJZTpfq}Kv)=Eq
zi}LkTnVBa70l^>$^<*`Lw}<1<VZh?C+h7M574wP8Q!T~(vY!-8@eHL<(KP?XPZCVp
sFqLxhwG)2)<E3^@fe){=N4hZ`qC13lvvlJ$pNAV~89jNMt&30j3yka!1^@s6

delta 695
zcmYL`Z%9*N6vnytzT3UK+k_bD5>33#aCBw6+H@odrKx0O4z)>G=>DX`wzADTH>aX~
zD}`A4eu?}N7(%dEc|fBwD2)C{WfDXZ5$cDmumY9H?rW4Ef6sZ&InR0D;TdV^xs(`9
zmE3!LHG)~pmPBvJ?+UgC{JBAMv^7_#Xpx+PIVKA3reITEM_!@VX7zgQc3d4pnem^g
zzmq+gr%xppyM|R1pN#b#m+62XOT}6P{<;^j@vQZf<i?sziX9sTGK_Ul(+WU)7bVH~
z{x)p_YJX5hBDJki2Mmm|4<|w>9o2>Momg@)4x?4F+P!X1z99O=Y^xZJDS0a7>MDHM
z%KNZ>UBlt+5?=?hp3Zc^&{?{QjQbFxZ^|&ZOdlgOzd~P;ar7R;L(IpxHVpx$CJgyY
zjDygHWoA?c(Szy<_4!aB<!=PNg)ig&pWR^LOSWjl!uM>^ZYzH{{hzZjD!00WE&FV?
zoLEc{1)&kXgi$v_%|-1&a-j(_x{=Ne=8vcnDJ#z{poTC!J*mngwA!qi3}gKoDuBgz
zswrBLZp^E0cg8Ju)ZlWe%NdHtw-T%Y?w(K&b%NuK`V}#m-m0@BQ0`y{2)(Xloe@0p
zg3W-+8P-pv@t5qG2$+s=y@akG<#uvvVe|XRbG9Wt#vCST&#0i_VLi7RP&^ZlIX4Yi
zPdIl(q5e|M0FArTG-^mI*Yx%%5`Lt)MnmDWX4VUXR^DSE(JrE2@!l1LznAeQsu(}J
zgv@a85I+`G8a_YZ84A8l@t+9I?$>UkV4*}it`NRDp?wdLN$rj<1qN-pQao3r>sKZO
N=2#<~x9fIU{s0#W@`?Ze

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 9fe5cd6a18..031a4e5cb3 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,14 +1,14 @@
 {
-    "/js/build/vue.js": "/js/build/vue.js?id=992bcb968a7f2da998b5",
+    "/js/build/vue.js": "/js/build/vue.js?id=8e0a9017cf028e8f66a8",
     "/css/AdminLTE.css": "/css/AdminLTE.css?id=5e72463a66acbcc740d5",
     "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
     "/css/overrides.css": "/css/overrides.css?id=d85394a0b4f58e81bb78",
-    "/js/build/vue.js.map": "/js/build/vue.js.map?id=e0eb0edc0b761965973f",
+    "/js/build/vue.js.map": "/js/build/vue.js.map?id=126dccfb286c6d1f809a",
     "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=99f5a5a03c4155cf69f6",
     "/css/app.css.map": "/css/app.css.map?id=bdbe05e6ecd70ccfac72",
     "/css/overrides.css.map": "/css/overrides.css.map?id=898c91d4a425b01b589b",
     "/css/dist/all.css": "/css/dist/all.css?id=0e3642f1b6a8a436d558",
-    "/js/dist/all.js": "/js/dist/all.js?id=39b95992f478d68c44a8",
+    "/js/dist/all.js": "/js/dist/all.js?id=39b69f6a05c1d81dc4bb",
     "/css/build/all.css": "/css/build/all.css?id=0e3642f1b6a8a436d558",
-    "/js/build/all.js": "/js/build/all.js?id=39b95992f478d68c44a8"
+    "/js/build/all.js": "/js/build/all.js?id=39b69f6a05c1d81dc4bb"
 }
\ No newline at end of file
diff --git a/resources/assets/js/components/forms/asset-models/fieldset-default-values.vue b/resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
index 71d7ee01ed..542f8d62e4 100644
--- a/resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
+++ b/resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
@@ -44,6 +44,8 @@
                             </div>
                             <div class="col-sm-12 col-lg-6">
                                 <input v-if="field.type == 'text'" class="form-control m-b-xs" type="text" :value="getValue(field)" :id="'default-value' + field.id" :name="'default_values[' + field.id + ']'">
+                                <textarea v-if="field.type == 'textarea'" class="form-control" :value="getValue(field)" :id="'default-value' + field.id" :name="'default_values[' + field.id + ']'"></textarea>
+
                                 <select v-if="field.type == 'listbox'" class="form-control m-b-xs" :name="'default_values[' + field.id + ']'">
                                     <option value="0"></option>
                                     <option v-for="field_value in field.field_values_array" :value="field_value" :selected="getValue(field) == field_value">{{ field_value }}</option>
diff --git a/resources/macros/macros.php b/resources/macros/macros.php
index c391700b9b..34aa072af0 100644
--- a/resources/macros/macros.php
+++ b/resources/macros/macros.php
@@ -504,6 +504,7 @@ Form::macro('customfield_elements', function ($name = "customfield_elements", $s
     $formats = array(
         'text' => 'Text Box',
         'listbox' => 'List Box',
+        'textarea' => 'Textarea (multi-line) ',
      //   'checkbox' => 'Checkbox',
      //   'radio' => 'Radio Buttons',
     );
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index ea33cd2f07..1973a6991c 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -167,7 +167,7 @@
         // Only display the custom format field if it's a custom format validation type
         $(".format").change(function(){
             $(this).find("option:selected").each(function(){
-                if (($(this).attr("value")=="") &&  $('.format').prop("selectedIndex") != 0) {
+                if ($('.format').prop("selectedIndex") == 1) {
                     $("#custom_regex").show();
                 } else{
                     $("#custom_regex").hide();
@@ -178,7 +178,7 @@
         // Only display the field element if the type is not text
         $(".field_element").change(function(){
             $(this).find("option:selected").each(function(){
-                if($(this).attr("value")!="text"){
+                if (($(this).attr("value")!="text") && ($(this).attr("value")!="textarea")){
                     $("#field_values_text").show();
                 } else{
                     $("#field_values_text").hide();
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index 3ec43cad7e..b03fbd6081 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -4,12 +4,17 @@
       <label for="{{ $field->db_column_name() }}" class="col-md-3 control-label">{{ $field->name }} </label>
       <div class="col-md-7 col-sm-12{{ ($field->pivot->required=='1') ? ' required' : '' }}">
 
+
           @if ($field->element!='text')
               <!-- Listbox -->
               @if ($field->element=='listbox')
                   {{ Form::select($field->db_column_name(), $field->formatFieldValuesAsArray(),
                   Input::old($field->db_column_name(),(isset($item) ? $item->{$field->db_column_name()} : $field->defaultValue($model->id))), ['class'=>'format select2 form-control']) }}
 
+              @elseif ($field->element=='textarea')
+                      <textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}" name="{{ $field->db_column_name() }}">{{ Input::old($field->db_column_name(),(isset($item) ? $item->{$field->db_column_name()} : $field->defaultValue($model->id))) }}</textarea>
+
+
               @elseif ($field->element=='checkbox')
                     <!-- Checkboxes -->
                   @foreach ($field->formatFieldValuesAsArray() as $key => $value)
diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php
index 4861b5d7a1..ae271c5835 100755
--- a/resources/views/models/edit.blade.php
+++ b/resources/views/models/edit.blade.php
@@ -49,8 +49,7 @@
     <fieldset-default-values
         model-id="{{ $item->id ?: '' }}"
         fieldset-id="{{ !empty($item->fieldset) ? $item->fieldset->id : Input::old('custom_fieldset') }}"
-        previous-input="{{ json_encode(Input::old('default_values')) }}"
-    >
+        previous-input="{{ json_encode(Input::old('default_values')) }}">
     </fieldset-default-values>
 </div>