dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #42563
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21763: EC: Removed file link during registration
------------------------------------------------------------
revno: 21763
committer: Markus Bekken <markus.bekken@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2016-01-15 16:44:16 +0100
message:
EC: Removed file link during registration
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2016-01-15 14:56:48 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2016-01-15 15:44:16 +0000
@@ -260,17 +260,20 @@
<div ng-switch-when="FILE_RESOURCE">
<div class="input-group">
<div class="form-control">
- <a href ng-click="downloadFile(currentEvent.event, eventGridColumn.id)">{{fileNames[currentEvent.event][eventGridColumn.id]}}</a>
+ <span ng-if="!currentEvent.event || currentEvent.event ==='SINGLE_EVENT'">{{fileNames[currentEvent.event][eventGridColumn.id]}}</span>
+ <a ng-if="currentEvent.event && currentEvent.event !=='SINGLE_EVENT'" href ng-click="downloadFile(currentEvent.event, eventGridColumn.id)">{{fileNames[currentEvent.event][eventGridColumn.id]}}</a>
</div>
<span class="input-group-btn">
- <span class="btn btn-primary btn-file">
- <span ng-if="currentEvent[eventGridColumn.id]"
+ <span class="btn btn-primary btn-file" ng-if="currentEvent[eventGridColumn.id]" ng-click="deleteFile(eventGridColumn.id)">
+ <span
title="{{'delete' | translate}}"
d2-file-input-name="fileNames[currentEvent.event][eventGridColumn.id]"
d2-file-input-delete="currentEvent[eventGridColumn.id]">
- <a href ng-click="deleteFile(eventGridColumn.id)"><i class="fa fa-trash alert-danger"></i></a>
+ <i class="fa fa-trash"></i>
</span>
- <span ng-if="!currentEvent[eventGridColumn.id]" title="{{'upload' | translate}}">
+ </span>
+ <span class="btn btn-primary btn-file" ng-if="!currentEvent[eventGridColumn.id]">
+ <span title="{{'upload' | translate}}">
<i class="fa fa-upload"></i>
<input type="file"
ng-required={{eventGridColumn.compulsory}}
@@ -582,17 +585,20 @@
<div ng-switch-when="FILE_RESOURCE">
<div class="input-group">
<div class="form-control">
- <a href ng-click="downloadFile(currentEvent.event, de.dataElement.id)">{{fileNames[currentEvent.event][de.dataElement.id]}}</a>
+ <span ng-if="!currentEvent.event || currentEvent.event ==='SINGLE_EVENT'">{{fileNames[currentEvent.event][de.dataElement.id]}}</span>
+ <a ng-if="currentEvent.event && currentEvent.event !=='SINGLE_EVENT'" href ng-click="downloadFile(currentEvent.event, de.dataElement.id)">{{fileNames[currentEvent.event][de.dataElement.id]}}</a>
</div>
<span class="input-group-btn">
- <span class="btn btn-primary btn-file">
- <span ng-if="currentEvent[de.dataElement.id]"
+ <span class="btn btn-primary btn-file" ng-if="currentEvent[de.dataElement.id]" ng-click="deleteFile(de.dataElement.id)">
+ <span
title="{{'delete' | translate}}"
d2-file-input-name="fileNames[currentEvent.event][de.dataElement.id]"
d2-file-input-delete="currentEvent[de.dataElement.id]">
- <a href ng-click="deleteFile(de.dataElement.id)"><i class="fa fa-trash alert-danger"></i></a>
+ <i class="fa fa-trash"></i>
</span>
- <span ng-if="!currentEvent[de.dataElement.id]" title="{{'upload' | translate}}">
+ </span>
+ <span class="btn btn-primary btn-file" ng-if="!currentEvent[de.dataElement.id]" >
+ <span title="{{'upload' | translate}}">
<i class="fa fa-upload"></i>
<input type="file"
ng-required={{eventGridColumn.compulsory}}
