Skip to content
Snippets Groups Projects
Commit f228e970 authored by David Siegfried's avatar David Siegfried Committed by Jan-Hendrik Willms
Browse files

remove description fields from semester_data and termine, closes #2483

Closes #2483

Merge request studip/studip!1675
parent ccabee1b
No related branches found
No related tags found
No related merge requests found
...@@ -75,7 +75,6 @@ class Admin_SemesterController extends AuthenticatedController ...@@ -75,7 +75,6 @@ class Admin_SemesterController extends AuthenticatedController
// Extract values // Extract values
$this->semester->name = Request::i18n('name'); $this->semester->name = Request::i18n('name');
$this->semester->description = Request::i18n('description');
$this->semester->semester_token = Request::i18n('token'); $this->semester->semester_token = Request::i18n('token');
$this->semester->beginn = $this->getTimeStamp('beginn'); $this->semester->beginn = $this->getTimeStamp('beginn');
$this->semester->ende = $this->getTimeStamp('ende', '23:59:59'); $this->semester->ende = $this->getTimeStamp('ende', '23:59:59');
......
...@@ -105,7 +105,6 @@ class Semester extends \RESTAPI\RouteMap ...@@ -105,7 +105,6 @@ class Semester extends \RESTAPI\RouteMap
'id' => $semester['semester_id'], 'id' => $semester['semester_id'],
'title' => (string) $semester['name'], 'title' => (string) $semester['name'],
'token' => (string) $semester['semester_token'], 'token' => (string) $semester['semester_token'],
'description' => (string) $semester['description'],
'begin' => (int) $semester['beginn'], 'begin' => (int) $semester['beginn'],
'end' => (int) $semester['ende'], 'end' => (int) $semester['ende'],
'seminars_begin' => (int) $semester['vorles_beginn'], 'seminars_begin' => (int) $semester['vorles_beginn'],
......
...@@ -29,14 +29,6 @@ ...@@ -29,14 +29,6 @@
]) ?> ]) ?>
</label> </label>
<label>
<?= _('Beschreibung') ?>
<?= I18N::textarea('description', $semester->description, [
'id' => 'description',
]) ?>
</label>
<label> <label>
<?= _('Externe ID') ?> <?= _('Externe ID') ?>
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<? endif; ?> <? endif; ?>
> >
</td> </td>
<td title="<?= htmlReady($semester->description) ?>"> <td>
<?= htmlReady($semester->name) ?> <?= htmlReady($semester->name) ?>
<? if (!$semester->visible): ?> <? if (!$semester->visible): ?>
<?= '(' . _('gesperrt') . ')'; ?> <?= '(' . _('gesperrt') . ')'; ?>
......
<?php
final class RemoveDescriptionFields extends Migration
{
public function description()
{
return 'Removes the unused database columns `termine`.`description`, `ex_termine`.`description` and `semester_data`.`description`';
}
protected function up()
{
$query = "ALTER TABLE `termine`
DROP COLUMN `description`";
DBManager::get()->exec($query);
$query = "ALTER TABLE `ex_termine`
DROP COLUMN `description`";
DBManager::get()->exec($query);
$query = "ALTER TABLE `semester_data`
DROP COLUMN `description`";
DBManager::get()->exec($query);
}
protected function down()
{
$query = "ALTER TABLE `termine`
ADD COLUMN `description` TEXT AFTER `content`";
DBManager::get()->exec($query);
$query = "ALTER TABLE `ex_termine`
ADD COLUMN `description` TEXT AFTER `content`";
DBManager::get()->exec($query);
$query = "ALTER TABLE `semester_data`
ADD COLUMN `description` TEXT NOT NULL AFTER `name`";
DBManager::get()->exec($query);
}
}
...@@ -17,7 +17,6 @@ class Semester extends SchemaProvider ...@@ -17,7 +17,6 @@ class Semester extends SchemaProvider
{ {
return [ return [
'title' => (string) $semester->name, 'title' => (string) $semester->name,
'description' => (string) $semester->description,
'token' => (string) $semester->token, 'token' => (string) $semester->token,
'start' => date('c', $semester->beginn), 'start' => date('c', $semester->beginn),
'end' => date('c', $semester->ende), 'end' => date('c', $semester->ende),
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
* @property string range_id database column * @property string range_id database column
* @property string autor_id database column * @property string autor_id database column
* @property string content database column * @property string content database column
* @property string description database column
* @property string date database column * @property string date database column
* @property string end_time database column * @property string end_time database column
* @property string mkdate database column * @property string mkdate database column
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
* @property string range_id database column * @property string range_id database column
* @property string autor_id database column * @property string autor_id database column
* @property string content database column * @property string content database column
* @property string description database column
* @property string date database column * @property string date database column
* @property string end_time database column * @property string end_time database column
* @property string mkdate database column * @property string mkdate database column
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
* @property string semester_id database column * @property string semester_id database column
* @property string id alias column for semester_id * @property string id alias column for semester_id
* @property string name database column * @property string name database column
* @property string description database column
* @property string semester_token database column * @property string semester_token database column
* @property string beginn database column * @property string beginn database column
* @property string ende database column * @property string ende database column
...@@ -64,7 +63,6 @@ class Semester extends SimpleORMap ...@@ -64,7 +63,6 @@ class Semester extends SimpleORMap
$config['registered_callbacks']['after_delete'][] = 'refreshCache'; $config['registered_callbacks']['after_delete'][] = 'refreshCache';
$config['i18n_fields']['name'] = true; $config['i18n_fields']['name'] = true;
$config['i18n_fields']['description'] = true;
$config['i18n_fields']['semester_token'] = true; $config['i18n_fields']['semester_token'] = true;
parent::configure($config); parent::configure($config);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment