Updated category ajax files to use type instead of app and add callCheck.

This commit is contained in:
Thomas Tanghus 2012-10-19 00:06:18 +02:00
parent 72f2f53e24
commit f4fd4a5a52
3 changed files with 35 additions and 25 deletions

View File

@ -15,23 +15,26 @@ function debug($msg) {
}
require_once '../../../lib/base.php';
OC_JSON::checkLoggedIn();
$category = isset($_GET['category'])?strip_tags($_GET['category']):null;
$app = isset($_GET['app'])?$_GET['app']:null;
if(is_null($app)) {
bailOut(OC_Contacts_App::$l10n->t('Application name not provided.'));
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
$l = OC_L10N::get('core');
$category = isset($_POST['category']) ? strip_tags($_POST['category']) : null;
$type = isset($_POST['type']) ? $_POST['type'] : null;
if(is_null($type)) {
bailOut($l->t('Category type not provided.'));
}
OC_JSON::checkAppEnabled($app);
if(is_null($category)) {
bailOut(OC_Contacts_App::$l10n->t('No category to add?'));
bailOut($l->t('No category to add?'));
}
debug(print_r($category, true));
$categories = new OC_VCategories($app);
$categories = new OC_VCategories($type);
if($categories->hasCategory($category)) {
bailOut(OC_Contacts_App::$l10n->t('This category already exists: '.$category));
} else {

View File

@ -16,21 +16,25 @@ function debug($msg) {
}
require_once '../../../lib/base.php';
OC_JSON::checkLoggedIn();
$app = isset($_POST['app'])?$_POST['app']:null;
$categories = isset($_POST['categories'])?$_POST['categories']:null;
if(is_null($app)) {
bailOut(OC_Contacts_App::$l10n->t('Application name not provided.'));
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
$l = OC_L10N::get('core');
$type = isset($_POST['type']) ? $_POST['type'] : null;
$categories = isset($_POST['categories']) ? $_POST['categories'] : null;
if(is_null($type)) {
bailOut($l->t('Object type not provided.'));
}
OC_JSON::checkAppEnabled($app);
debug('The application "'.$app.'" uses the default file. OC_VObjects will not be updated.');
debug('The application using category type "' . $type . '" uses the default file for deletion. OC_VObjects will not be updated.');
if(is_null($categories)) {
bailOut('No categories selected for deletion.');
bailOut($l->t('No categories selected for deletion.'));
}
$vcategories = new OC_VCategories($app);
$vcategories = new OC_VCategories($type);
$vcategories->delete($categories);
OC_JSON::success(array('data' => array('categories'=>$vcategories->categories())));

View File

@ -17,16 +17,19 @@ function debug($msg) {
require_once '../../../lib/base.php';
OC_JSON::checkLoggedIn();
$app = isset($_GET['app'])?$_GET['app']:null;
if(is_null($app)) {
bailOut('Application name not provided.');
$l = OC_L10N::get('core');
$type = isset($_GET['type']) ? $_GET['type'] : null;
if(is_null($type)) {
bailOut($l->t('Category type not provided.'));
}
OC_JSON::checkAppEnabled($app);
$tmpl = new OC_TEMPLATE("core", "edit_categories_dialog");
OC_JSON::checkAppEnabled($type);
$tmpl = new OCP\Template("core", "edit_categories_dialog");
$vcategories = new OC_VCategories($app);
$vcategories = new OC_VCategories($type);
$categories = $vcategories->categories();
debug(print_r($categories, true));
$tmpl->assign('categories', $categories);