Skip to content

Commit

Permalink
Merge pull request #703 from axelrindle/feature/display-ids
Browse files Browse the repository at this point in the history
Display certain IDs in frontend
  • Loading branch information
marcelfolaron authored May 5, 2022
2 parents 1a9bd90 + 1f8f805 commit e837610
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 0 deletions.
2 changes: 2 additions & 0 deletions resources/language/de-DE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,8 @@ label.twoFA_setup = "Zwei-Faktor Authentifikation einrichten"
label.copy_of = "Kopievon"
label.assignSameUsers = "Den gleichen Benutzern zuweisen"
label.newProjectName = "Neuer Projektname"
label.client_id = "Kundennummer"
label.ticket_id = "Ticketnummer"

dropdown.how_big_todo = "Wie aufwendig ist diese Aufgabe?"
dropdown.select_priority = "Welche Priorität hat diese Aufgabe?"
Expand Down
2 changes: 2 additions & 0 deletions resources/language/de-DE_informal.ini
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,8 @@ label.twoFA_setup = "Zwei-Faktor Authentifikation einrichten"
label.copy_of = "Kopievon"
label.assignSameUsers = "Den gleichen Benutzern zuweisen"
label.newProjectName = "Neuer Projektname"
label.client_id = "Kundennummer"
label.ticket_id = "Ticketnummer"

dropdown.how_big_todo = "Wie aufwendig ist diese Aufgabe?"
dropdown.select_priority = "Welche Priorität hat diese Aufgabe?"
Expand Down
2 changes: 2 additions & 0 deletions resources/language/en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,8 @@ label.twoFA_setup = "Set Up New Two-factor Authentication"
label.copy_of = "Copy of"
label.assignSameUsers = "Assign the same users"
label.newProjectName = "New Project Name"
label.client_id = "Client ID"
label.ticket_id = "Ticket ID"

dropdown.how_big_todo = "How large is this To-Do?"
dropdown.select_priority = "What is the priority of this task?"
Expand Down
1 change: 1 addition & 0 deletions src/domain/clients/controllers/class.showClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public function run()
$row = $clientRepo->getClient($id);

$clientValues = array(
'id' => $row['id'],
'name' => $row['name'],
'street' => $row['street'],
'zip' => $row['zip'],
Expand Down
2 changes: 2 additions & 0 deletions src/domain/clients/templates/showAll.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
</colgroup>
<thead>
<tr>
<th class='head0'><?php echo $this->__('label.client_id'); ?></th>
<th class='head1'><?php echo $this->__('label.client_name'); ?></th>
<th class='head0'><?php echo $this->__('label.url') ?></th>
<th class='head1'><?php echo $this->__('label.number_of_projects'); ?></th>
Expand All @@ -37,6 +38,7 @@

<?php foreach($this->get('allClients') as $row) { ?>
<tr>
<td><?php echo $row['id']; ?></td>
<td>
<?php echo $this->displayLink('clients.showClient', $this->escape($row['name']), array('id' => $this->escape($row['id']))) ?>
</td>
Expand Down
7 changes: 7 additions & 0 deletions src/domain/clients/templates/showClient.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
<div class="col-md-6">
<h4 class="widgettitle title-light"><span class="iconfa iconfa-leaf"></span> <?php echo $this->__('subtitle.details'); ?></h4>

<div class="form-group">
<label class="span4 control-label"><?php echo $this->__('label.client_id') ?></label>
<div class="span6">
<input type="text" name="id" id="id" value="<?php $this->e($values['id']); ?>" readonly />
</div>
</div>

<div class="form-group">
<label class="span4 control-label"><?php echo $this->__('label.name') ?></label>
<div class="span6">
Expand Down
1 change: 1 addition & 0 deletions src/domain/tickets/templates/showKanban.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@
</div>
<?php } ?>
<small><i class="fa <?php echo $todoTypeIcons[strtolower($row['type'])]; ?>"></i> <?php echo $this->__("label.".strtolower($row['type'])); ?></small>
<small>#<?php echo $row['id']; ?></small>

<h4><a href="<?=BASE_URL ?>/tickets/showTicket/<?php echo $row["id"];?>"><?php $this->e($row["headline"]);?></a></h4>
<p class="description"><?php echo $this->truncate(html_entity_decode($row["description"]), 200, '...', false, true);?><?php if(strlen($row["description"]) >= 200) echo" (...)";?></p>
Expand Down
6 changes: 6 additions & 0 deletions src/domain/tickets/templates/submodules/ticketDetails.sub.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
<div class="row-fluid">
<div class="span12">
<h4 class="widgettitle title-light"><span class="iconfa iconfa-leaf"></span><?php echo $this->__('subtitle.general'); ?></h4>
<div class="form-group">
<label class="span4 control-label"><?php echo $this->__('label.ticket_id'); ?></label>
<div class="span6">
<input type="text" value="<?php $this->e($ticket->id); ?>" name="id" autocomplete="off" style="width:99%;" readonly/>
</div>
</div>
<div class="form-group">
<label class="span4 control-label"><?php echo $this->__('label.ticket_title'); ?>*</label>
<div class="span6">
Expand Down

0 comments on commit e837610

Please sign in to comment.