From 13f64c460176047268808f0f218d255e13f00837 Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Thu, 15 May 2014 09:46:36 +0000
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=90=E9=9B=86=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=97=B6=E7=9A=84=E7=99=BB=E5=BD=95=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/controllers/DataController.php          | 6 ++++++
 .../views/scripts/glacier/view-glacier-selection.phtml      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php
index 6a9033f9..54ffc8bf 100755
--- a/application/default/controllers/DataController.php
+++ b/application/default/controllers/DataController.php
@@ -1107,6 +1107,12 @@ class DataController extends Zend_Controller_Action
 		$this->_helper->layout->disableLayout();
 		$this->_helper->viewRenderer->setNoRender();
 		
+		if(empty(view::User('id')))
+		{
+			$this->jsonexit(array("error"=>'please login first'));
+			return true;
+		}
+		
 		$uuid = $this->_getParam("uuid");
 		$basin = $this->getParam("basin");
 		$mountain = $this->getParam("mountain");
diff --git a/application/default/views/scripts/glacier/view-glacier-selection.phtml b/application/default/views/scripts/glacier/view-glacier-selection.phtml
index ae3d21c4..e5f5580f 100644
--- a/application/default/views/scripts/glacier/view-glacier-selection.phtml
+++ b/application/default/views/scripts/glacier/view-glacier-selection.phtml
@@ -173,7 +173,7 @@
         </form>
     </div>
     <div class="modal-footer">
-    	<button type="button" onclick="westdc.dataservice.geoData()" class="btn btn-success">Apply</button>
+    	<button type="button" onclick="westdc.dataservice.geoData()" class="btn btn-success">Order</button>
     	<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
     </div>
 </div>