Use build numbers in changeset tag, and also in help dialog (for testers)

diff --git a/net/systemeD/potlatch2/help/HelpDialog.mxml b/net/systemeD/potlatch2/help/HelpDialog.mxml
index fb7ff0c73254c7e63e4180511e54e2051d22130d..12035f2ffdd324fc7f4e2ccfff638d7cdf56881d 100644 (file)
--- a/net/systemeD/potlatch2/help/HelpDialog.mxml
+++ b/net/systemeD/potlatch2/help/HelpDialog.mxml
@@ -339,6 +339,7 @@
   </mx:TabNavigator>
 
   <mx:ControlBar>
+    <mx:Label text="Version: {Application.application.version} Build: {Application.application.build_number}" />
     <mx:Spacer width="100%"/>
     <mx:Button label="Ok" click="PopUpManager.removePopUp(this);"/>
   </mx:ControlBar>

diff --git a/net/systemeD/potlatch2/save/SaveDialog.mxml b/net/systemeD/potlatch2/save/SaveDialog.mxml
index 8407a062e48b6bfb1f084747897570ad3e6bff6a..2f4a994b093248493daa51e931f711c86fb0fa85 100644 (file)
--- a/net/systemeD/potlatch2/save/SaveDialog.mxml
+++ b/net/systemeD/potlatch2/save/SaveDialog.mxml
@@ -8,6 +8,7 @@
   <mx:ArrayCollection id="changesetTags">
     <mx:Object k="created_by" v="Potlatch 2"/>
     <mx:Object k="version" v="{Application.application.version}"/>
+    <mx:Object k="build" v="{Application.application.build_number}"/>
     <mx:Object k="comment" v=""/>
   </mx:ArrayCollection>
   
@@ -135,7 +136,7 @@
     private function allowForEdit(event:DataGridEvent):void {
         /* check before editing the tag grid that it's neither created_by nor version tags */
         var item:Object = ((event.currentTarget as DataGrid).dataProvider as ArrayCollection)[event.rowIndex];
-        if(item.k == 'created_by' || item.k == 'version') {
+        if(item.k == 'created_by' || item.k == 'version' || item.k == 'build') {
           event.preventDefault();
         }
     }
@@ -148,7 +149,7 @@
         var editor:TextInput = (event.currentTarget as DataGrid).itemEditorInstance as TextInput;
 
         if( event.dataField == "k" ) {
-          if( editor.text == 'created_by' || editor.text == 'version' ) {
+          if( editor.text == 'created_by' || editor.text == 'version' || editor.text == 'build') {
             event.preventDefault();
           }
         }