--- a/src/p4l/api/serializers.py Wed Sep 18 15:27:13 2013 +0200
+++ b/src/p4l/api/serializers.py Wed Sep 18 15:51:57 2013 +0200
@@ -125,6 +125,7 @@
projectNames = ThesaurusSerializer(many=True, slug_field='uri')
subjectCorporateBodies = ThesaurusSerializer(many=True, slug_field='uri')
corporateAuthors = ThesaurusSerializer(many=True, slug_field='uri')
+ audiences = ThesaurusSerializer(many=True, slug_field='uri')
class Meta:
model = Record
@@ -132,11 +133,11 @@
read_only_fields = ('identifier', 'uri')
fields = ("identifier", "uri", "subjects", "notes", "otherLanguages",
"language", "editionStatement", "recordType", "isDocumentPart",
- "isMultilingual", "themes", "countries", "projectNames",
- "subjectCorporateBodies", "corporateAuthors", "imprints",
- "titles", "addedTitles", "issns", "isbns", "documentCodes",
+ "isHidden", "isRestricted", "themes", "countries", "projectNames",
+ "subjectCorporateBodies", "corporateAuthors", "corporateAuthorLabel",
+ "imprints", "titles", "addedTitles", "issns", "isbns", "documentCodes",
"abstracts", "titlesMainDocument", "collations", "volumeIssues",
"periodicals", "meetings", "subjectMeetings", "series",
- "authors", "subjectPersons", "urls")
+ "authors", "subjectPersons", "urls", "audiences")
--- a/src/p4l/static/p4l/templates/urlDisp.html Wed Sep 18 15:27:13 2013 +0200
+++ b/src/p4l/static/p4l/templates/urlDisp.html Wed Sep 18 15:51:57 2013 +0200
@@ -1,5 +1,4 @@
<span>
-<div class="col-md-5 break-word"><a href="{{ obj.address }}" target="_blank">{{ obj.address }}</a></div>
+<div class="col-md-7 break-word"><a href="{{ obj.address }}" target="_blank">{{ obj.address }}</a></div>
<div class="col-md-2">{{ obj.display }}</div>
-<div class="col-md-2">{{ obj.accessLevel }}</div>
</span>
\ No newline at end of file
--- a/src/p4l/static/p4l/templates/urlForm.html Wed Sep 18 15:27:13 2013 +0200
+++ b/src/p4l/static/p4l/templates/urlForm.html Wed Sep 18 15:51:57 2013 +0200
@@ -7,8 +7,4 @@
<label for="display-{{$id}}">{{'display'|translate}}</label>
<input type="text" placeholder="{{'display'|translate}}" ng_model="editedObj.display" id="display-{{$id}}" class="form-control"/>
</div>
- <div class="form-group">
- <label for="accessLevel-{{$id}}">{{'Access Level'|translate}}</label>
- <input type="text" placeholder="{{'Access Level'|translate}}" ng_model="editedObj.accessLevel" id="accessLevel-{{$id}}" class="form-control"/>
- </div>
</form>
\ No newline at end of file
--- a/src/p4l/templates/p4l/p4l_record_view.html Wed Sep 18 15:27:13 2013 +0200
+++ b/src/p4l/templates/p4l/p4l_record_view.html Wed Sep 18 15:51:57 2013 +0200
@@ -192,6 +192,10 @@
<td><ul>{% for k,v in corporateAuthors_labels.items %}<li>{{ v }} <small class="text-muted">({{ k }})</small></li>{% endfor %}</ul></td>
</tr>
<tr>
+ <td>{% trans 'corporate author label' %}</td>
+ <td>{{ record.corporateAuthorLabel }}</td>
+ </tr>
+ <tr>
<td>{% trans 'Urls' %}</td>
<td>
<ul>
@@ -215,8 +219,12 @@
<td><input type="checkbox" disabled="disabled" {% if record.isDocumentPart %}checked="checked"{% endif %} /></td>
</tr>
<tr>
- <td>{% trans 'is multilingual' %}</td>
- <td><input type="checkbox" disabled="disabled" {% if record.isMultilingual %}checked="checked"{% endif %} /></td>
+ <td>{% trans 'is hidden' %}</td>
+ <td><input type="checkbox" disabled="disabled" {% if record.isHidden %}checked="checked"{% endif %} /></td>
+ </tr>
+ <tr>
+ <td>{% trans 'is restricted' %}</td>
+ <td><input type="checkbox" disabled="disabled" {% if record.isRestricted %}checked="checked"{% endif %} /></td>
</tr>
</tbody>
</table>
--- a/src/p4l/templates/p4l/record_update_form.html Wed Sep 18 15:27:13 2013 +0200
+++ b/src/p4l/templates/p4l/record_update_form.html Wed Sep 18 15:51:57 2013 +0200
@@ -189,10 +189,14 @@
<td><add-sem-uri list="record.corporateAuthors" listname="organizations" placeholder="{{'Add a new organization' | translate}}"></add-sem-uri></td>
</tr>
<tr>
+ <td>{{ 'corporate authors label' | translate }}</td>
+ <td><input type="text" class="form-control" ng-model="record.corporateAuthorLabel" /></td>
+ </tr>
+ <tr>
<td>{{ 'Urls' | translate }}</td>
<td><object-list form-template="urlForm" disp-template="urlDisp" object-list="record.urls"
- object-fields='["address", "display", "accessLevel"]' table="true"
- size-fields='[5, 2, 2]' label-fields='["Address", "Display", "Access level"]'></object-list></td>
+ object-fields='["address", "display"]' table="true"
+ size-fields='[7, 2]' label-fields='["Address", "Display"]'></object-list></td>
</tr>
<tr>
<td>{{ 'record type' | translate }}</td>
@@ -203,8 +207,12 @@
<td><input type="checkbox" ng-model="record.isDocumentPart" /></td>
</tr>
<tr>
- <td>{{ 'is multilingual' | translate }}</td>
- <td><input type="checkbox" ng-model="record.isMultilingual" /></td>
+ <td>{{ 'is hidden' | translate }}</td>
+ <td><input type="checkbox" ng-model="record.isHidden" /></td>
+ </tr>
+ <tr>
+ <td>{{ 'is restricted' | translate }}</td>
+ <td><input type="checkbox" ng-model="record.isRestricted" /></td>
</tr>
</tbody>
</table>