Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:zammad/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2017-03-18 13:53:52 +01:00
parent 7f16ad4fd3 19a81bbdb1
commit d2070f4407
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/models/object_manager_attribute.coffee
View file

@ -4,7 +4,7 @@ class App.ObjectManagerAttribute extends App.Model
@url: @apiPath + '/object_manager_attributes'
@configure_attributes = [
{ name: 'name', display: 'Name', tag: 'input', type: 'text', limit: 100, null: false },
{ name: 'display', display: 'Anzeige', tag: 'input', type: 'text', limit: 100, null: false },
{ name: 'display', display: 'Display', tag: 'input', type: 'text', limit: 100, null: false },
{ name: 'object', display: 'Object', tag: 'input', readonly: 1 },
{ name: 'position', display: 'Position', tag: 'input', readonly: 1 },
{ name: 'active', display: 'Active', tag: 'active', default: true },

8
app/assets/javascripts/app/views/layout_ref/user_list.jst.eco
View file

@ -163,7 +163,7 @@
<td><span>Niklas</span></td>
<td class="actionCell no-padding">
<div class="btn btn--primary btn--table switchView"><%- @Icon('switchView') %> Aus Benutzeransicht anzeigen</div>
<div class="btn btn--primary btn--table switchView"><%- @Icon('switchView') %> View from user's perspective</div>
</td>
</tr>
@ -175,7 +175,7 @@
<td><span>Hubermeyerschmidt</span></td>
<td class="actionCell no-padding">
<div class="btn btn--primary btn--table switchView"><%- @Icon('switchView') %> Aus Benutzeransicht anzeigen</div>
<div class="btn btn--primary btn--table switchView"><%- @Icon('switchView') %> View from user's perspective</div>
</td>
</tr>
@ -187,7 +187,7 @@
<td><span>Braun</span></td>
<td class="actionCell no-padding">
<div class="btn btn--primary btn--table switchView"><%- @Icon('switchView') %> Aus Benutzeransicht anzeigen</div>
<div class="btn btn--primary btn--table switchView"><%- @Icon('switchView') %> View from user's perspective</div>
</td>
</tr>
@ -199,7 +199,7 @@
<td><span>Blanko</span></td>
<td class="actionCell no-padding">
<div class="btn btn--primary btn--table switchView"><%- @Icon('switchView') %> Aus Benutzeransicht anzeigen</div>
<div class="btn btn--primary btn--table switchView"><%- @Icon('switchView') %> View from user's perspective</div>
</td>
</tr>
</tbody>