Skip to content

Commit

Permalink
Dev: removed all instances of packages_{dir}
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisGac authored and TonisOrmisson committed Jul 14, 2017
1 parent 903de92 commit ba05b85
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions application/models/TemplateConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
* @property string $viewdirectory
* @property string $filesdirectory
* @property string $packages_to_load
* @property string $packages_ltr
* @property string $packages_rtl
*
*
Expand Down Expand Up @@ -110,10 +109,10 @@ public function rules()
array('id, sid, gsid', 'numerical', 'integerOnly'=>true),
array('templates_name', 'length', 'max'=>150),
array('cssframework_name', 'length', 'max'=>45),
array('files_css, files_js, files_print_css, options, cssframework_css, cssframework_js, packages_to_load, packages_ltr, packages_rtl', 'safe'),
array('files_css, files_js, files_print_css, options, cssframework_css, cssframework_js, packages_to_load', 'safe'),
// The following rule is used by search().
// @todo Please remove those attributes that should not be searched.
array('id, templates_name, sid, gsid, files_css, files_js, files_print_css, options, cssframework_name, cssframework_css, cssframework_js, packages_to_load, packages_ltr, packages_rtl', 'safe', 'on'=>'search'),
array('id, templates_name, sid, gsid, files_css, files_js, files_print_css, options, cssframework_name, cssframework_css, cssframework_js, packages_to_load', 'safe', 'on'=>'search'),
);
}

Expand Down Expand Up @@ -145,8 +144,6 @@ public function attributeLabels()
'cssframework_css' => 'Cssframework Css',
'cssframework_js' => 'Cssframework Js',
'packages_to_load' => 'Packages To Load',
'packages_ltr' => 'Packages Ltr',
'packages_rtl' => 'Packages Rtl',
);
}

Expand Down Expand Up @@ -228,7 +225,7 @@ public static function importXML($sTemplateName)
if ($oNewTemplateConfiguration->save()){
return true;
}else{
throw new Exception($oNewTemplateConfiguration->getErrors());
throw new Exception($oNewTemplateConfiguration->getErrors());
}
}else{
return $oNewTemplate->getErrors();
Expand Down

0 comments on commit ba05b85

Please sign in to comment.