dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #28135
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14026: sharing for category, categoryOption, categoryCombo, categoryOptionGroup, categoryOptionGroupSet
------------------------------------------------------------
revno: 14026
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-02-14 20:17:54 +0700
message:
sharing for category, categoryOption, categoryCombo, categoryOptionGroup, categoryOptionGroupSet
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/categoryOptionGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/categoryOptionGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm
--
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-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/categoryOptionGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/categoryOptionGroup.vm 2014-02-13 12:51:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/categoryOptionGroup.vm 2014-02-14 13:17:54 +0000
@@ -1,3 +1,6 @@
+
+#sharingDialog()
+
<script type="text/javascript">
jQuery(document).ready(function(){
tableSorter( 'categoryOptionGroupList' );
@@ -12,6 +15,7 @@
<div id="contextMenu" class="contextMenu">
<ul id="contextMenuItems" class="contextMenuItems">
+ <li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i> $i18n.getString( "sharing_settings" )</a></li>
<li><a data-target-fn="showUpdateCategoryOptionGroupForm"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
<li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i> $i18n.getString( "translation_translate" )</a></li>
<li><a data-target-fn="removeCategoryOptionGroup"><i class="fa fa-trash-o"></i> $i18n.getString( "remove" )</a></li>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/categoryOptionGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/categoryOptionGroupSet.vm 2014-02-13 15:03:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/categoryOptionGroupSet.vm 2014-02-14 13:17:54 +0000
@@ -1,4 +1,6 @@
+#sharingDialog()
+
<script type="text/javascript">
jQuery(document).ready(function(){
tableSorter( 'categoryOptionGroupSetList' );
@@ -11,6 +13,7 @@
<div id="contextMenu" class="contextMenu">
<ul id="contextMenuItems" class="contextMenuItems">
+ <li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i> $i18n.getString( "sharing_settings" )</a></li>
<li><a data-target-fn="showUpdateCategoryOptionGroupSetForm"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
<li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i> $i18n.getString( "translation_translate" )</a></li>
<li><a data-target-fn="removeCategoryOptionGroupSet"><i class="fa fa-trash-o"></i> $i18n.getString( "remove" )</a></li>
@@ -36,7 +39,7 @@
</thead>
<tbody id="list">
#foreach( $categoryOptionGroupSet in $categoryOptionGroupSets )
- <tr id="tr${categoryOptionGroupSet.id}" data-id="$!categoryOptionGroupSet.id" data-uid="$!categoryOptionGroupSet.uid" data-type="CategoryOptionGroup" data-name="$encoder.htmlEncode( $!categoryOptionGroupSet.displayName )"
+ <tr id="tr${categoryOptionGroupSet.id}" data-id="$!categoryOptionGroupSet.id" data-uid="$!categoryOptionGroupSet.uid" data-type="CategoryOptionGroupSet" data-name="$encoder.htmlEncode( $!categoryOptionGroupSet.displayName )"
data-can-manage="$security.canManage( $categoryOptionGroupSet )"
data-can-update="$security.canUpdate( $categoryOptionGroupSet )"
data-can-delete="$security.canDelete( $categoryOptionGroupSet )">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm 2013-12-04 12:58:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm 2014-02-14 13:17:54 +0000
@@ -1,3 +1,6 @@
+
+#sharingDialog()
+
<script type="text/javascript">
jQuery(document).ready(function(){
tableSorter( 'categoryList' );
@@ -34,6 +37,7 @@
<div id="contextMenu" class="contextMenu">
<ul id="contextMenuItems" class="contextMenuItems">
+ <li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i> $i18n.getString( "sharing_settings" )</a></li>
<li><a data-target-fn="showUpdateDataElementCategoryForm"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
<li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i> $i18n.getString( "translation_translate" )</a></li>
<li><a data-target-fn="removeDataElementCategory"><i class="fa fa-trash-o"></i> $i18n.getString( "remove" )</a></li>
@@ -59,7 +63,7 @@
<tbody id="list">
#foreach( $dataElementCategory in $dataElementCategories )
#if( $dataElementCategory.id != $defaultCategory.id )
- <tr id="tr${dataElementCategory.id}" data-id="$!dataElementCategory.id" data-uid="$!dataElementCategory.uid" data-type="DataElementCategory" data-name="$encoder.htmlEncode( $!dataElementCategory.displayName )"
+ <tr id="tr${dataElementCategory.id}" data-id="$!dataElementCategory.id" data-uid="$!dataElementCategory.uid" data-type="Category" data-name="$encoder.htmlEncode( $!dataElementCategory.displayName )"
data-can-manage="$security.canManage( $dataElementCategory )"
data-can-update="$security.canUpdate( $dataElementCategory )"
data-can-delete="$security.canDelete( $dataElementCategory )">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm 2013-12-04 12:58:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm 2014-02-14 13:17:54 +0000
@@ -1,3 +1,6 @@
+
+#sharingDialog()
+
<script type="text/javascript">
jQuery(document).ready(function(){
tableSorter( 'categoryComboList' );
@@ -10,6 +13,7 @@
<div id="contextMenu" class="contextMenu">
<ul id="contextMenuItems" class="contextMenuItems">
+ <li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i> $i18n.getString( "sharing_settings" )</a></li>
<li><a data-target-fn="showUpdateDataElementCategoryComboForm"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
<li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i> $i18n.getString( "translation_translate" )</a></li>
<li><a data-target-fn="removeDataElementCategoryCombo"><i class="fa fa-trash-o"></i> $i18n.getString( "remove" )</a></li>
@@ -36,7 +40,7 @@
<tbody id="list">
#foreach( $dataElementCategoryCombo in $dataElementCategoryCombos )
#if( $dataElementCategoryCombo.id != $defaultCombo.id )
- <tr id="tr${dataElementCategoryCombo.id}" data-id="$!dataElementCategoryCombo.id" data-uid="$!dataElementCategoryCombo.uid" data-type="DataElementCategoryCombo" data-name="$encoder.htmlEncode( $!dataElementCategoryCombo.displayName )"
+ <tr id="tr${dataElementCategoryCombo.id}" data-id="$!dataElementCategoryCombo.id" data-uid="$!dataElementCategoryCombo.uid" data-type="CategoryCombo" data-name="$encoder.htmlEncode( $!dataElementCategoryCombo.displayName )"
data-can-manage="$security.canManage( $dataElementCategoryCombo )"
data-can-update="$security.canUpdate( $dataElementCategoryCombo )"
data-can-delete="$security.canDelete( $dataElementCategoryCombo )">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm 2014-01-02 10:14:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm 2014-02-14 13:17:54 +0000
@@ -1,3 +1,6 @@
+
+#sharingDialog()
+
<script type="text/javascript">
jQuery(document).ready(function(){
tableSorter( 'categoryList' );
@@ -35,6 +38,7 @@
<div id="contextMenu" class="contextMenu">
<ul id="contextMenuItems" class="contextMenuItems">
+ <li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i> $i18n.getString( "sharing_settings" )</a></li>
<li><a data-target-fn="showUpdateDataElementCategoryOptionForm"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
<li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i> $i18n.getString( "translation_translate" )</a></li>
<li><a data-target-fn="removeDataElementCategoryOption"><i class="fa fa-trash-o"></i> $i18n.getString( "remove" )</a></li>
@@ -60,7 +64,7 @@
<tbody id="list">
#foreach( $dataElementCategoryOption in $dataElementCategoryOptions )
#if( $dataElementCategoryOption.id != $defaultCategoryOption.id )
- <tr id="tr${dataElementCategoryOption.id}" data-id="$!dataElementCategoryOption.id" data-uid="$!dataElementCategoryOption.uid" data-type="DataElementCategoryOption" data-name="$encoder.htmlEncode( $!dataElementCategoryOption.displayName )"
+ <tr id="tr${dataElementCategoryOption.id}" data-id="$!dataElementCategoryOption.id" data-uid="$!dataElementCategoryOption.uid" data-type="CategoryOption" data-name="$encoder.htmlEncode( $!dataElementCategoryOption.displayName )"
data-can-manage="$security.canManage( $dataElementCategoryOption )"
data-can-update="$security.canUpdate( $dataElementCategoryOption )"
data-can-delete="$security.canDelete( $dataElementCategoryOption )">
