Skip to content

Commit

Permalink
Renames moble-survey-editor > mobile-survey-designer, re #4357
Browse files Browse the repository at this point in the history
  • Loading branch information
chiatt committed Dec 18, 2018
1 parent 76a2f32 commit 6dec4ae
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion arches/app/media/js/models/mobile-survey.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ define([
'arches'
], function(_, ko, koMapping, AbstractModel, arches) {
return AbstractModel.extend({
url: arches.urls.mobile_survey_editor,
url: arches.urls.mobile_survey_designer,

initialize: function(options) {
var self = this;
Expand Down
4 changes: 2 additions & 2 deletions arches/app/media/js/views/mobile-survey-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ define([
var viewModel = new MobileSurveysViewModel(data);

viewModel.navigateToEditor = function(survey) {
window.location = arches.urls.mobile_survey_editor(survey.id);
window.location = arches.urls.mobile_survey_designer(survey.id);
};

viewModel.newMobileSurvey = function() {
var surveyid = uuid.generate();
window.location = arches.urls.mobile_survey_editor(surveyid);
window.location = arches.urls.mobile_survey_designer(surveyid);
};

viewModel.deleteMobileSurvey = function(mobilesurvey){
Expand Down
2 changes: 1 addition & 1 deletion arches/app/templates/javascript.htm
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
add_resource: function(graphid){return "{% url 'add_resource' 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' %}".replace('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', graphid)},
function_manager: function(graphid){return "{% url 'function_manager' 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' %}".replace('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', graphid)},
mobile_survey_resources: function(surveyid){return "{% url 'mobile_survey_resources' 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' %}".replace('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', surveyid)},
mobile_survey_editor: function(surveyid){return "{% url 'mobile_survey_editor' 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' %}".replace('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', surveyid)},
mobile_survey_designer: function(surveyid){return "{% url 'mobile_survey_designer' 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' %}".replace('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', surveyid)},
mobile_survey: "{% url 'mobile_survey_manager' %}",
help_template: "{% url 'help_templates' %}"
},
Expand Down
8 changes: 4 additions & 4 deletions arches/app/views/mobile_survey.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@


@method_decorator(group_required('Application Administrator'), name='dispatch')
class MobileSurveyListView(BaseManagerView):
class MobileSurveyManagerView(BaseManagerView):

def get_survey_resources(self, mobile_survey_models):
graphs = models.GraphModel.objects.filter(isresource=True).exclude(graphid=settings.SYSTEM_SETTINGS_RESOURCE_MODEL_ID)
Expand Down Expand Up @@ -167,7 +167,7 @@ def delete(self, request):


@method_decorator(group_required('Application Administrator'), name='dispatch')
class MobileSurveyManagerView(MapBaseManagerView):
class MobileSurveyDesignerView(MapBaseManagerView):

def get(self, request, surveyid):

Expand Down Expand Up @@ -231,7 +231,7 @@ def get_last_login(date):
identities=serializer.serialize(identities, sort_keys=False),
resources=serializer.serialize(resources, sort_keys=False),
resource_download_limit=settings.MOBILE_DOWNLOAD_RESOURCE_LIMIT,
main_script='views/mobile-survey-editor',
main_script='views/mobile-survey-designer',
)

context['nav']['title'] = _('Mobile Survey Manager')
Expand All @@ -241,7 +241,7 @@ def get_last_login(date):
'template': 'mobile-survey-manager-help',
}

return render(request, 'views/mobile-survey-editor.htm', context)
return render(request, 'views/mobile-survey-designer.htm', context)

def delete(self, request):
mobile_survey_id = None
Expand Down
6 changes: 3 additions & 3 deletions arches/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from arches.app.views.user import UserManagerView
from arches.app.views.tile import TileData
from arches.app.views.map import MapLayerManagerView
from arches.app.views.mobile_survey import MobileSurveyManagerView, MobileSurveyResources, MobileSurveyListView
from arches.app.views.mobile_survey import MobileSurveyManagerView, MobileSurveyResources, MobileSurveyDesignerView
from arches.app.views.auth import LoginView, SignupView, ConfirmSignupView, ChangePasswordView, GetTokenView, GetClientIdView
from arches.app.models.system_settings import settings
from arches.app.utils.forms import ArchesPasswordResetForm
Expand Down Expand Up @@ -136,8 +136,8 @@
url(r'^feature_popup_content$', main.feature_popup_content, name="feature_popup_content"),
url(r'^user$', UserManagerView.as_view(), name="user_profile_manager"),
url(r'^user/get_user_names$', UserManagerView.as_view(action='get_user_names'), name="get_user_names"),
url(r'^mobile_survey_manager/*', MobileSurveyListView.as_view(), name="mobile_survey_manager"),
url(r'^mobile_survey_editor/(?P<surveyid>%s)$' % uuid_regex, MobileSurveyManagerView.as_view(), name='mobile_survey_editor'),
url(r'^mobile_survey_manager/*', MobileSurveyManagerView.as_view(), name="mobile_survey_manager"),
url(r'^mobile_survey_designer/(?P<surveyid>%s)$' % uuid_regex, MobileSurveyDesignerView.as_view(), name='mobile_survey_designer'),
url(r'^mobile_survey_resources/(?P<surveyid>%s)/resources$' % uuid_regex, MobileSurveyResources.as_view(), name='mobile_survey_resources'),
url(r'^couchdb/(?P<path>.*)$', api.CouchdbProxy.as_view()),
url(r'^surveys$', api.Surveys.as_view(), name='surveys'),
Expand Down

0 comments on commit 6dec4ae

Please sign in to comment.